Merge "Merge branch 'buildsystem'" into refs/staging/master
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 27 Jun 2012 06:26:26 +0000 (08:26 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 27 Jun 2012 06:49:46 +0000 (08:49 +0200)

Trivial merge