Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 27 May 2011 15:04:00 +0000 (01:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 27 May 2011 15:04:00 +0000 (01:04 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  QmlDebugger: removing slots in Live Preview
  QmlDebugger: adding slots to items in Live Preview


Trivial merge