Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
authorGeir Vattekar <geir.vattekar@nokia.com>
Tue, 29 Jun 2010 13:13:40 +0000 (15:13 +0200)
committerGeir Vattekar <geir.vattekar@nokia.com>
Tue, 29 Jun 2010 13:13:40 +0000 (15:13 +0200)
commitc2c720cf948f2779aa82e003a2db4d951f94e77f
tree0f3662fcf8a336f6cd7d5090184f7ead2336691e
parent497fd44414dea6314731b96869e2d49bb8b439b5
parent1209a398c3b59b21b38036fffd4fb2442320e5c3
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7