Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
authoraavit <qt-info@nokia.com>
Thu, 8 Sep 2011 19:42:55 +0000 (21:42 +0200)
committeraavit <qt-info@nokia.com>
Thu, 8 Sep 2011 19:42:55 +0000 (21:42 +0200)
commitce47387a3e055c64326294198f93817d173265d2
treea056a3bb47557ea8a55a82b0469ef13138364a1b
parenta2c2c71ecd84e90f72697dfd57544c8d506c78e2
parent80294c375eca9687d1c34e9ab048294373e7f00c
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team