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)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix to commit 7fce0a73cc9b099c4ca67b3bc2e8bbe3060230c6.


Trivial merge