Merge branch 'bmx6_testing_new_config' into bmx6_testing
authorAxel Neumann <neumann@cgws.de>
Sat, 17 Aug 2013 11:58:49 +0000 (13:58 +0200)
committerAxel Neumann <neumann@cgws.de>
Sat, 17 Aug 2013 11:58:49 +0000 (13:58 +0200)

Trivial merge