Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Sun, 8 May 2011 03:17:33 +0000 (13:17 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 8 May 2011 03:17:33 +0000 (13:17 +1000)
commitcf1440a6e390bb81484a1ff103c33b9ffae193c7
tree504dd7b7308f065c1b8742390d6143aa57e8f591
parente219892b9dcb7fa94aaffefb8b8cbd9fdad6f2fa
parentab5374319868d30386a4d5ded16ad0758fe374a1
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Install private headers into the correct location