OSDN Git Service

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
authorck <qt-info@nokia.com>
Mon, 8 Feb 2010 10:44:43 +0000 (11:44 +0100)
committerck <qt-info@nokia.com>
Mon, 8 Feb 2010 10:44:43 +0000 (11:44 +0100)

Trivial merge