Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
authorRhys Weatherley <rhys.weatherley@nokia.com>
Fri, 13 Aug 2010 01:13:40 +0000 (11:13 +1000)
committerRhys Weatherley <rhys.weatherley@nokia.com>
Fri, 13 Aug 2010 01:13:40 +0000 (11:13 +1000)
commitf37b6a4cd767817ab699c5baeb40c23ad8172a7b
tree24188deb06c3c13ac5c64f8c8d521659de41caf6
parent6155050f68cc86c445552da61a5f240c16f5e2cd
parent574845691eec14d4df0d13bb182a83c997546150
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6