Merge branch 'master' into bmx6_testing
authorAxel Neumann <neumann@cgws.de>
Sat, 3 Aug 2013 20:01:58 +0000 (22:01 +0200)
committerAxel Neumann <neumann@cgws.de>
Sat, 3 Aug 2013 20:01:58 +0000 (22:01 +0200)

Trivial merge