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)
* '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


Trivial merge