Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 17 Sep 2011 23:17:50 +0000 (09:17 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 17 Sep 2011 23:17:50 +0000 (09:17 +1000)
commit492054b9b78287122cb2a56dd39b7dd843075d02
tree5139697f5441ee32183b801798e846f364e53f28
parenta8f1213c6a0ca85ce7027c9911136305d62501cb
parentc6b4e8e28456fe389e30c2038808681f86140950
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: