Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 18:49:31 +0000 (04:49 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 18:49:31 +0000 (04:49 +1000)
commit6c6cf86e7d65f8f5154d62ad0ed67d5221269335
tree682a71f2568ec13b713e527ef9ff88d18c08fa4d
parentfdaea804c9fdbe8b974a97bb565104c0453c6b61
parentef177c41a614094c85fa89373c7e9075cac0da18
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Removed some trailing whitespace
  Moved the QML Observer Service and related functionality into Qt