Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
authorLorn Potter <lorn.potter@nokia.com>
Tue, 9 Nov 2010 01:23:37 +0000 (11:23 +1000)
committerLorn Potter <lorn.potter@nokia.com>
Tue, 9 Nov 2010 01:23:37 +0000 (11:23 +1000)
commit6b8a95b2521d843ec2b3f7c787c15b92e4ea686f
tree346bc8925d83b2729f485d1259729fca931de07d
parentbb8f085611f4cb91b7bde7220d407948edcc572c
parente00af84cc9230df411981d2f3b9296b61d5d1c50
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7