Merge branch '4.7' of ../../qt/4.7 into 4.7
authorJustin McPherson <justin.mcpherson@nokia.com>
Thu, 22 Apr 2010 23:54:51 +0000 (09:54 +1000)
committerJustin McPherson <justin.mcpherson@nokia.com>
Thu, 22 Apr 2010 23:54:51 +0000 (09:54 +1000)
commit478e914638f2131d1547c4e2dc4659723657194d
treec9f63e6bd79dce411ae059b1bb65a66db6584264
parent6b30ee9d2219308605e0d1b15ea1c74dc5cb67fe
parent4894e6dd57c31e0196c6fdae4d1b2fb16b9f1b16
Merge branch '4.7' of ../../qt/4.7 into 4.7

Conflicts:
demos/multimedia/player/player.pro
demos/multimedia/player/player.pro
src/src.pro