Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Tue, 30 Mar 2010 05:55:57 +0000 (07:55 +0200)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Tue, 30 Mar 2010 05:55:57 +0000 (07:55 +0200)
commite925d5ebed4b319c57c1a3097a0e25c9cd562bcb
treecf84a523c4a327dc142394c9c0617d4047eb1d33
parent4da9590140c063551f261b883fb275cafe986b60
parent864ace14e12cedd8e8f78841249e5309eb0a0795
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7