Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 07:24:49 +0000 (17:24 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 07:24:49 +0000 (17:24 +1000)
commit7f9c32bd39b02a3335e9473f4bb255f54d13009d
treed639157563b7260efa524ef4cad43dc30abc94f0
parent4bcd4c08fe29f2446691b002a70be983871864f1
parent8fb592846930f09ff465442fd10e522226963968
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix QDefaultAnimationDriver