Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Tue, 25 Dec 2012 19:22:12 +0000 (20:22 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Tue, 25 Dec 2012 19:22:12 +0000 (20:22 +0100)

Trivial merge