Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 21 Jul 2012 13:39:58 +0000 (15:39 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 21 Jul 2012 13:39:58 +0000 (15:39 +0200)

Trivial merge