Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 26 Sep 2011 12:24:57 +0000 (22:24 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 26 Sep 2011 12:24:57 +0000 (22:24 +1000)
commite2e2ee6684931bb0325d4b973709a315f7477cb2
treecfc34761b3cb6816187def9ad59eb4b59f8e95ef
parente2f475b0e32d302ea8b755e7c16274077b454725
parent140e68ae50411631aa5c1649face4c7d9d1b651d
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix broken qglthreads autotest build on Solaris.
  Don't store the alignment attribute for spacers