* merge
authorFrank Herchet <frank.fh.herchet@bmw.de>
Tue, 14 Feb 2012 16:12:12 +0000 (17:12 +0100)
committerFrank Herchet <frank.fh.herchet@bmw.de>
Tue, 14 Feb 2012 16:12:12 +0000 (17:12 +0100)

Trivial merge