Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 10:00:08 +0000 (20:00 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 10:00:08 +0000 (20:00 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
  Designer: Extend container extension.


Trivial merge