Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 15:11:57 +0000 (01:11 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 15:11:57 +0000 (01:11 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix compilation with namespaces enabled


Trivial merge