Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 7 May 2011 03:27:01 +0000 (13:27 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 7 May 2011 03:27:01 +0000 (13:27 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix Makefile subtargets


Trivial merge