Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
authorMorten Sorvig <msorvig@trolltech.com>
Thu, 10 Sep 2009 09:59:32 +0000 (11:59 +0200)
committerMorten Sorvig <msorvig@trolltech.com>
Thu, 10 Sep 2009 09:59:32 +0000 (11:59 +0200)
commiteb5430e0091ec257b417fe24ed20b3973151c928
treea44a772d51f25093ba3c833ff1095186d2b167dd
parent106d7a210be1e6d52946b575a262e2c76c5e51e6
parent7691e70a130df66e4597c9fe1ada03496c8c5ba0
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6