Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 18:55:40 +0000 (04:55 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 18:55:40 +0000 (04:55 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Honor -nomake for examples and demos
  Update module version number to 5.0.0


Trivial merge