Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 22:28:10 +0000 (08:28 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 22:28:10 +0000 (08:28 +1000)
commit21391b0c408a931a95285fae2def170d64489883
tree6c3786dfd4baaf358ca227e51541b74181bf98c3
parentb53ea893caf1626a1ebfd61545525d101f1c2833
parente8f9a5048987caf45f59e802326c198ca56f5293
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.