Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 26 May 2010 11:20:58 +0000 (13:20 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 26 May 2010 11:20:58 +0000 (13:20 +0200)
commit9dcc2de14862da0bba6b74c51ac6e7a5193d4f08
tree63dbe850481112641be5f859e7529378f2d731a8
parent624e614c0c3852fe24f756280f0fb4d8781704fc
parentf835a5bcdd75ed8d18dac4de3e68983725c7ea83
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Make test work with shadow builds again.