Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Sun, 1 Jul 2012 00:24:26 +0000 (02:24 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sun, 1 Jul 2012 00:24:40 +0000 (02:24 +0200)
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

Trivial merge