Merge remote branch 'buildsau/master'
authorchristian mueller <christian.ei.mueller@bmw.de>
Thu, 23 Feb 2012 16:37:07 +0000 (17:37 +0100)
committerchristian mueller <christian.ei.mueller@bmw.de>
Thu, 23 Feb 2012 16:37:07 +0000 (17:37 +0100)

Trivial merge