Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
commitd55e32086e47fc530378a6d3887e16b881e2d649
authorhjk <qtc-committer@nokia.com>
Thu, 15 Jan 2009 14:27:59 +0000 (15 15:27 +0100)
committerhjk <qtc-committer@nokia.com>
Thu, 15 Jan 2009 14:27:59 +0000 (15 15:27 +0100)
tree4120a191e84e13fd2b5ff268f2ccadd6cf12ff6e
parentf08c67b465ef3da20f1e804aa6a28686ec892757
parent20eb6a1b82f2a5b88d15cf438420789d81d1704b
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline