Merge remote branch 'buildsau/master'
authorchristian mueller <christian.ei.mueller@bmw.de>
Wed, 29 Feb 2012 12:28:13 +0000 (13:28 +0100)
committerchristian mueller <christian.ei.mueller@bmw.de>
Wed, 29 Feb 2012 12:28:13 +0000 (13:28 +0100)

Trivial merge