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>
Thu, 8 Oct 2009 10:48:50 +0000 (12:48 +0200)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>
Thu, 8 Oct 2009 10:48:50 +0000 (12:48 +0200)

Trivial merge