Merge branch 'master' into bmx6_testing
authorAxel Neumann <neumann@cgws.de>
Sun, 16 Jun 2013 20:28:17 +0000 (22:28 +0200)
committerAxel Neumann <neumann@cgws.de>
Sun, 16 Jun 2013 20:28:17 +0000 (22:28 +0200)

Trivial merge