Merge branch '4.7-upstream' into 4.7-doc
authorA-Team <ateam@pad.test.qt.nokia.com>
Fri, 15 Oct 2010 22:00:22 +0000 (00:00 +0200)
committerA-Team <ateam@pad.test.qt.nokia.com>
Fri, 15 Oct 2010 22:00:22 +0000 (00:00 +0200)
commit0b47cfe1163598bbc3e867073fb1b7c5b238fe73
treecc5cf8846f8c9c670a2354070e47e0ad09f71cc0
parente7b372e4705451dfd4443db7e6fc64d4b8f30c68
parent4d9d3ed84c3bf1f6d08a9ddd36f834b9c8972b38
Merge branch '4.7-upstream' into 4.7-doc