Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Wed, 30 Nov 2011 00:00:12 +0000 (01:00 +0100)
committerWater-Team <water@pad.test.qt.nokia.com>
Wed, 30 Nov 2011 00:00:12 +0000 (01:00 +0100)
commit53d854eb3ba095f2e13a35f4d7eb01670d9874b4
tree2832e2565aed90653ded8c3d324974b16aab338c
parent6f57de55305c64e0d612d9643962b4d1e8b81dec
parente6f5fc28e82732dd214d87bd6c6a8a2efbf89f14
Merge branch '4.8-upstream' into master-water