Merge branch '4.8' of git:qt/qt into qt-4.8-from-4.7
authorThiago Macieira <thiago.macieira@nokia.com>
Wed, 18 May 2011 11:29:53 +0000 (13:29 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Wed, 18 May 2011 11:29:53 +0000 (13:29 +0200)
commit271b2272b28c3634e97912d85615c23bf8021754
treeb426c3a515b2388c39059aa2cdc8fd409661787c
parentbcec005dd1cb6eea2c2a43b681be9b56eb06fba7
parent2c07b5d2cba8d8e499bd0861eefef12d4e00d99a
Merge branch '4.8' of git:qt/qt into qt-4.8-from-4.7