Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Fri, 22 Mar 2013 23:28:21 +0000 (00:28 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Fri, 22 Mar 2013 23:28:21 +0000 (00:28 +0100)

Trivial merge