Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
authorMiikka Heikkinen <miikka.heikkinen@digia.com>
Fri, 25 Sep 2009 13:21:03 +0000 (16:21 +0300)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>
Fri, 25 Sep 2009 13:21:03 +0000 (16:21 +0300)
commit0683ee31f0b08a7f75c89ee2e12399c404c29c60
treeb717b79b67ae1ea01866799ac6d5cefd26927d58
parent237c2afc0846224e00e5889c2c3ee8bde583689d
parentf2fa66d3dd722d88c651738bef7b1ccb3c91c156
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6