Merge branch 'master' into stable master-stable-switch
authorHenning Rogge <hrogge@googlemail.com>
Wed, 15 Aug 2012 16:00:55 +0000 (18:00 +0200)
committerHenning Rogge <hrogge@googlemail.com>
Wed, 15 Aug 2012 16:00:55 +0000 (18:00 +0200)

Trivial merge