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>
Thu, 7 Oct 2010 08:48:32 +0000 (10:48 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Oct 2010 08:48:32 +0000 (10:48 +0200)
commit46822d7091ef05e64e363e7209ea3e613e4d386d
treea9b083d01f41464f3fd8230f27d8b5d8c51dd55a
parente2c45cbacaa0f48e1397572d3e5baa847c86e9b1
parent6967f9e3fadfff8122809207dc7a99af444f699b
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:
  Fix build with cups 1.5 snapshots