Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 12:04:15 +0000 (22:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 12:04:15 +0000 (22:04 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  QmlDebug: Fix QmlOstPlugin compilation failure
  QmlDebug: Fix QmlOstPlugin compilation failure


Trivial merge