Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Tue, 7 Sep 2010 16:35:56 +0000 (18:35 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Tue, 7 Sep 2010 16:35:56 +0000 (18:35 +0200)
commit703d85e8991e2061062f6d7c695cdeb45d9661fd
tree12548ba44aec50979cc116ffba392b8dcd166b58
parentb3de9c2ee4c9f36a6133fc78109909c3ee6317fd
parenta93243ce81fdc71842bb133e7eadb9476e4648e4
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7