OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authormae <qtc-committer@nokia.com>
Mon, 16 Feb 2009 11:51:11 +0000 (12:51 +0100)
committermae <qtc-committer@nokia.com>
Mon, 16 Feb 2009 11:51:11 +0000 (12:51 +0100)

Trivial merge