OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authorDaniel Molkentin <daniel.molkentin@nokia.com>
Wed, 4 Mar 2009 11:49:14 +0000 (12:49 +0100)
committerDaniel Molkentin <daniel.molkentin@nokia.com>
Wed, 4 Mar 2009 11:49:14 +0000 (12:49 +0100)

Trivial merge