Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 7 Dec 2011 12:48:49 +0000 (22:48 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 7 Dec 2011 12:48:49 +0000 (22:48 +1000)
commit2608d28edb8eeed925be89a6adc563287d12fbb2
tree31f67bb4bbbfe2ed01ade9676b071450908161d9
parent8a390046adddb8df3ddcf3a421f6f547e6cfe7aa
parentec31c6e5294285d0dc8e96d30d1300cfd1b0e96a
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:
  Revert "Fix sqlite driver memory eating due to close failure"