Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Wed, 3 Aug 2011 06:04:06 +0000 (08:04 +0200)
committerLiang Qi <liang.qi@nokia.com>
Wed, 3 Aug 2011 06:04:06 +0000 (08:04 +0200)
commit443a1c9e569044e83605c6350dfda384201cfe83
treeed4f976b9aef175b5afb68ca22e8ae7991ab99ca
parent62d6b794be90087848958dc2516f213bfa70f36d
parentc2f1012e54f43886d513346e0f6e4ba6dc87da45
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7