Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Wed, 31 Aug 2011 23:00:13 +0000 (01:00 +0200)
committerWater-Team <water@pad.test.qt.nokia.com>
Wed, 31 Aug 2011 23:00:13 +0000 (01:00 +0200)
commitaa31031ca88d8db0c1c997d50fb789dbe0cb9b55
treec3621fe5240e49fc1c260447b4d3cfbf453f07b6
parent7fb04c5964e47e71b709a413be7839a3cedbba9e
parentf14bbde351d90bed520f9503500f922f7aa18c92
Merge branch '4.8-upstream' into master-water