Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
authorJason McDonald <jason.mcdonald@nokia.com>
Wed, 9 Sep 2009 02:46:43 +0000 (12:46 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Wed, 9 Sep 2009 02:46:43 +0000 (12:46 +1000)
commit53a3705d2498a69389a06444290b699a2d9dc7f3
tree22cdf743e73956c13b319ecc1ade5a60c83c9753
parentf80f8bf7d17c646a13d20b76e9ab1eeaa3c7fc74
parentb3d8d30b254b23f15089dc0caf9a41a24bad817e
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5