Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 15:56:30 +0000 (01:56 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 15:56:30 +0000 (01:56 +1000)
commit0ad5b0a3e636f95f8dfec5c8ecb39f3e85780b7f
treea4769f60516373b9980b1458a595eb569e3a8aab
parentd37a3529ec883985b2967265f0797d749db74308
parentd64c805f8159f8d7b35ceedf3f4dfe4f659efeb6
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team

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