Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
authorLiang QI <liang.qi@nokia.com>
Fri, 18 Sep 2009 15:06:06 +0000 (17:06 +0200)
committerLiang QI <liang.qi@nokia.com>
Fri, 18 Sep 2009 15:06:06 +0000 (17:06 +0200)
commit8212300e723d08802e890a59f8483521840fa655
treea95065d643b822adba9f9fe7c4b6dd18a21de97a
parent9446b1745196acc7a6693b4ca2ca169f51fef97b
parent4aaec357acd92046103836e760af941de5c53c93
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6