Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Fri, 16 Sep 2011 23:00:14 +0000 (01:00 +0200)
committerWater-Team <water@pad.test.qt.nokia.com>
Fri, 16 Sep 2011 23:00:14 +0000 (01:00 +0200)
commit84ace02a016ded4752b6711166dd16dd8bfb4330
tree5139697f5441ee32183b801798e846f364e53f28
parent2fa6d410c6733863b19393c13efbdcb7efd59fc0
parente1de7eda203cef794bb48c01155a7eaea24f902d
Merge branch '4.8-upstream' into master-water