OSDN Git Service

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
authorcon <qtc-committer@nokia.com>
Thu, 25 Nov 2010 16:51:10 +0000 (17:51 +0100)
committercon <qtc-committer@nokia.com>
Thu, 25 Nov 2010 16:51:10 +0000 (17:51 +0100)

Trivial merge