Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Wed, 23 Nov 2011 00:00:14 +0000 (01:00 +0100)
committerWater-Team <water@pad.test.qt.nokia.com>
Wed, 23 Nov 2011 00:00:14 +0000 (01:00 +0100)
commit3a9b8ff032b56b61b0e91213ca898793f0f31795
tree3dc4ce838fb8ba3d36461b5126e9ec2f72e83010
parent6f94f2a7f824e2c586390ae831dd638c8c71faeb
parent5f2090f0f2280c32d06fbc5188ccb799d7b1a489
Merge branch '4.8-upstream' into master-water