Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
authorKeith Isdale <keith.isdale@nokia.com>
Tue, 1 Sep 2009 00:17:35 +0000 (10:17 +1000)
committerKeith Isdale <keith.isdale@nokia.com>
Tue, 1 Sep 2009 00:17:35 +0000 (10:17 +1000)
commit624fda24c71285945bc54936910c4da1ddc742ff
treea90c7813fc62008d5d295e4c3fe2a844c1c2c584
parent7a5d0d0b9f8b9203aa3921b2eb9fd7c77095c685
parent397fb3ece0fb556bc158cf1e826145196d2e6e95
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6