Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 9 May 2011 15:16:35 +0000 (01:16 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 9 May 2011 15:16:35 +0000 (01:16 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Turned on private headers for some plugins.


Trivial merge