Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Sun, 27 Nov 2011 00:00:12 +0000 (01:00 +0100)
committerWater-Team <water@pad.test.qt.nokia.com>
Sun, 27 Nov 2011 00:00:12 +0000 (01:00 +0100)
commit5e68676ae4955fe03d9b8da5a33567abde0b91c3
tree8e615fadf749ba15486962d28655bef51c5e9ee4
parent4466ac29e9a9bd0cc9a0e49c9064a9eb208c04a4
parentf48870f8efbcf7ca4e344e48e4f61334f35b9c6c
Merge branch '4.8-upstream' into master-water