Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
authorJani Hautakangas <ext-jani.hautakangas@nokia.com>
Fri, 18 Sep 2009 11:39:46 +0000 (14:39 +0300)
committerJani Hautakangas <ext-jani.hautakangas@nokia.com>
Fri, 18 Sep 2009 11:39:46 +0000 (14:39 +0300)
commit82108cb53ae39283d97e80c92f8632f3ebab673f
tree3bc867af647056688e7ae76a7652e133a26d49cd
parentc78dabc55943b76479f7a84bae146f52cbc7bbbf
parentab6c1dd25d81de30350d35d175276b89ba58f4ae
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6