Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Sat, 26 Nov 2011 00:00:13 +0000 (01:00 +0100)
committerWater-Team <water@pad.test.qt.nokia.com>
Sat, 26 Nov 2011 00:00:13 +0000 (01:00 +0100)
commit4466ac29e9a9bd0cc9a0e49c9064a9eb208c04a4
tree528113739406c7968f71445a61eb04a74067182f
parent6a63e71096c577144d646b637451ea812287ceb1
parent6e2cb0d34085dc4767c11e796ad5e2dd32a72e51
Merge branch '4.8-upstream' into master-water