Merge branch '4.6' master-stable
authorOlivier Goffart <ogoffart@trolltech.com>
Thu, 10 Sep 2009 19:50:15 +0000 (21:50 +0200)
committerOlivier Goffart <ogoffart@trolltech.com>
Thu, 10 Sep 2009 19:50:15 +0000 (21:50 +0200)
commit84192b403446744fa5a946ba395a2fb1b5552e97
tree6be29f8d352d62c9fdb4aaefddbf0c7fc3aa3af8
parenta3256014d6adb31c89b0e5de5b0decc393649b70
parent80c11987819a2451ebecefc5b2bf1b42ad4499ae
Merge branch '4.6'