OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authorhjk <qtc-committer@nokia.com>
Fri, 23 Jan 2009 17:30:27 +0000 (18:30 +0100)
committerhjk <qtc-committer@nokia.com>
Fri, 23 Jan 2009 17:30:27 +0000 (18:30 +0100)

Trivial merge