Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Fri, 25 Nov 2011 00:00:13 +0000 (01:00 +0100)
committerWater-Team <water@pad.test.qt.nokia.com>
Fri, 25 Nov 2011 00:00:13 +0000 (01:00 +0100)
commit6a63e71096c577144d646b637451ea812287ceb1
tree98ae4bf3eabb81c7bbb8384cde97d4152223d8c3
parent366a6b941eecb9d5381d9513d591bdfcf5847425
parent0e7c7f75b404c26b420cb174f062eda02846641f
Merge branch '4.8-upstream' into master-water