Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 1 Sep 2010 01:58:46 +0000 (03:58 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 1 Sep 2010 01:58:46 +0000 (03:58 +0200)
commitdac9e5dd5644d29d6a8dde752e7c594727f16661
treeffa9975424aa9f7e198346dce9792093b22dc495
parent0b438841e98add45fbddce51e210aea0c97a1f91
parent19198b08a1d5b6f4e6875d93e2647b38e8f11184
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Some small Solaris fixes.