Merge "Merge branch 'buildsystem' (second round)" into refs/staging/master
authorMark Brand <mabrand@mabrand.nl>
Fri, 29 Jun 2012 19:26:11 +0000 (21:26 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 29 Jun 2012 19:26:11 +0000 (21:26 +0200)

Trivial merge