Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Tue, 29 Nov 2011 00:00:12 +0000 (01:00 +0100)
committerWater-Team <water@pad.test.qt.nokia.com>
Tue, 29 Nov 2011 00:00:12 +0000 (01:00 +0100)
commit6f57de55305c64e0d612d9643962b4d1e8b81dec
tree8de9df2697598738f8094ddeb420519b68d1d7b3
parent5e68676ae4955fe03d9b8da5a33567abde0b91c3
parent5dda0170988d7b9207e5aac31b624645ac797d8b
Merge branch '4.8-upstream' into master-water