Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 4 Jul 2011 00:57:41 +0000 (10:57 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 4 Jul 2011 00:57:41 +0000 (10:57 +1000)
commit3e42e0076e16c8c98fb5fe9bbb290ccc3499cb97
treece00e623525b6a2b6a11d0d40a9d2f7f2d8504b5
parent2e0f534cc4c47a939d2ee959a68a2a1b9ec6482b
parent1225ee9c51dfd950f4f72f6f6f13733e6656063d
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Added qtfeedback module.