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)
commite219892b9dcb7fa94aaffefb8b8cbd9fdad6f2fa
tree44806a16623a1deedbcb30e60111fe18c058ede5
parentde47cd9b668d4c43b26f21cc05a37399f4a5be12
parent9fe4482de138fcac465b31673644925448b0cedf
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix Makefile subtargets