Merge branch '4.6' of git:qt/qt into 4.6
commit26b8b6783afe2c1c9f27c935eb46c05229757af1
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 27 Aug 2009 15:17:30 +0000 (27 17:17 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 27 Aug 2009 15:17:30 +0000 (27 17:17 +0200)
tree6e906223eefee16488dc3a12b4e8704b94dca1ef
parent8c755acd7549a1de53acb9d93e9a44e333be2b5b
parent5daf4391bcf40416c7ea99f8dbbfe28efe1cb19f
Merge branch '4.6' of git:qt/qt into 4.6