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 20:58:29 +0000 (06:58 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 20:58:29 +0000 (06:58 +1000)
commit664517abdefcdce692a4078770fbd96068fec1f4
tree7f0691db676c3ca19a0fe48ac7b1fbc15941440b
parentd4a649e8b0b9d8dc35516b8884b490c344a01c54
parent1a1471718d6c99a52211ab060f3627c2478bb738
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 compilation with namespaces