Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 7 Jul 2012 00:17:20 +0000 (02:17 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 7 Jul 2012 00:17:20 +0000 (02:17 +0200)

Trivial merge