Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
authorAaron Kennedy <aaron.kennedy@nokia.com>
Mon, 5 Jul 2010 08:32:25 +0000 (18:32 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Mon, 5 Jul 2010 08:32:25 +0000 (18:32 +1000)
commit42318a57e95a875b2168ca027679d9258fcc929b
tree88217a1a9df26fc0ec7f4af83607c727c9944b38
parent09f07b98dfdaec2e48749768b967a48e588d3f7f
parent739d4460d28d0ebcde4e5960f533c2a7554049f6
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7