OSDN Git Service

Merge branch '1.3' of git@scm.dev.nokia.troll.no:creator/mainline into 1.3
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Wed, 14 Oct 2009 12:18:42 +0000 (14:18 +0200)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>
Wed, 14 Oct 2009 12:18:42 +0000 (14:18 +0200)

Trivial merge