Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 12:30:28 +0000 (22:30 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 12:30:28 +0000 (22:30 +1000)
commit3f8923d3a5d90220f376ac5946e32df2629f87f9
tree92f7d3ae1b66d587e38d42908ea4d633460f7856
parent8cd8e5e4cb9b8222bf6afdb980424bb571e0f977
parent587f7f753a97ecf5b9c5b2ee7e562699331010bc
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix to commit 7fce0a73cc9b099c4ca67b3bc2e8bbe3060230c6.