Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 11 Jan 2011 05:10:09 +0000 (15:10 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 11 Jan 2011 05:10:09 +0000 (15:10 +1000)
commitb344f1933252ba34c73d03958550eb73746963e9
tree6c3786dfd4baaf358ca227e51541b74181bf98c3
parentb53ea893caf1626a1ebfd61545525d101f1c2833
parent21391b0c408a931a95285fae2def170d64489883
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.