Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 15:42:31 +0000 (01:42 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 15:42:31 +0000 (01:42 +1000)
commitca724e095bd17f5f21bce64e7f0a5c287fdd6899
treef3c3712acb5197a86bd99a08a9f454ad47b98964
parent1355da4b0f212921aeff201960a11ef8de6625a0
parentd49c561b7374bf72684c6eaea6e65c71f69e0150
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Add the QIdentityProxyModel.