Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
authorJanne Anttila <janne.anttila@digia.com>
Mon, 31 Aug 2009 10:18:15 +0000 (13:18 +0300)
committerJanne Anttila <janne.anttila@digia.com>
Mon, 31 Aug 2009 10:18:15 +0000 (13:18 +0300)
commit5d3a2b852aaaa66f120ab4d8618900dfa603e359
tree79e86f692bb3b56eb02dd5797ab20b1e5c34470c
parentc9e10372b59584c99f225bdf5453f0f03b9d5f59
parentae88ef4063548816efd4371920deeb4d87ea98f4
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6