Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 11:21:45 +0000 (21:21 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 11:21:45 +0000 (21:21 +1000)
commit1edd1c95febc10b43e3a2cb94cecb25cdcc69146
tree432a7059de2fe20eba7dc1ee4fcb4add0085531a
parent03fd149345da214271a65ea6b8b6548563c94d0b
parentf0857b766772b2dac0d7ced5cbc2edd66f2cdcca
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Compile on Mac