Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 22 Jun 2011 17:53:25 +0000 (03:53 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 22 Jun 2011 17:53:25 +0000 (03:53 +1000)
commit66ced6e042300977a70d13a92cd7445a9c11c67a
treead1665a6707813037f68ecd174d6e84bbebbbc86
parent5e80b137d195625c0d57c1c27e5e8464d1ccfa33
parente4e90fe966391c2f8f09f3690be6c3dc154b8bd1
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: