Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
authorSami Merila <sami.merila@nokia.com>
Thu, 16 Dec 2010 08:53:30 +0000 (10:53 +0200)
committerSami Merila <sami.merila@nokia.com>
Thu, 16 Dec 2010 08:53:30 +0000 (10:53 +0200)
commitfcdd6eba85ecfe65856bc20910810659a4b5df00
tree5b5151cde25e6efc689084f96703b935811e34e8
parentd8990fbd132fc9e456c55a624eeb709088b0b819
parent310473ac82a85735f576796f6784fdbe56370256
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7