Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Sat, 17 Sep 2011 23:00:12 +0000 (01:00 +0200)
committerWater-Team <water@pad.test.qt.nokia.com>
Sat, 17 Sep 2011 23:00:12 +0000 (01:00 +0200)
commitc6b4e8e28456fe389e30c2038808681f86140950
tree5139697f5441ee32183b801798e846f364e53f28
parent84ace02a016ded4752b6711166dd16dd8bfb4330
parentcee22b68ed811f5b26a891d6a644613ad79aa981
Merge branch '4.8-upstream' into master-water