Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Thu, 18 Aug 2011 23:00:15 +0000 (01:00 +0200)
committerWater-Team <water@pad.test.qt.nokia.com>
Thu, 18 Aug 2011 23:00:15 +0000 (01:00 +0200)
commit607b7d39c32e5d1f334f7af91ad626c7acb5e460
tree61f9e5820ef06c436037b7957e36b4e3af84ae17
parente58a402fbee2fc8af8cd651acafdc28525ed1314
parente2abcf0d8e83a9403c57b1504a663310e888e2dd
Merge branch '4.8-upstream' into master-water