Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 12:59:20 +0000 (22:59 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 12:59:20 +0000 (22:59 +1000)
commita2adca3e63803ace785033bb43423a4961e0f2d0
tree6f7567b6b98c3277746d35647e055912069a00dc
parent21f021f8a7b2f25a6d42a872d3511ced4ec53fe2
parent58f060499c12e47cecd800ae591ddd9548715f1d
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging:
  Squashed commit of changes from the 4.8-temp branch.
  Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)