Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
authorMartin Jones <martin.jones@nokia.com>
Wed, 27 Apr 2011 05:22:20 +0000 (15:22 +1000)
committerMartin Jones <martin.jones@nokia.com>
Wed, 27 Apr 2011 05:22:20 +0000 (15:22 +1000)
commitdcf9a1f2f20248de0da9549af54bc3a4844eaf5b
treec9eee3ff39000816113bcab3a5c035da97c2a9fc
parent47712d1f330e4b22ce6dd30e7557288ef7f7fca0
parent415951891cd75170f1e4b89b46effa3319b56e4e
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7