Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
authorIain <qt-info@nokia.com>
Thu, 10 Sep 2009 10:02:32 +0000 (12:02 +0200)
committerIain <qt-info@nokia.com>
Thu, 10 Sep 2009 10:02:32 +0000 (12:02 +0200)
commit919a1435732cc4e4678639e6952f42df4ccfd9f1
tree4ba1989cfab48351350278ece79cece0c28a084f
parent8fa0229e076db453fa3133d1a41ec94152be0f61
parenteb5430e0091ec257b417fe24ed20b3973151c928
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6