OSDN Git Service

Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline into 1.2
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Tue, 16 Jun 2009 10:00:14 +0000 (12:00 +0200)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>
Tue, 16 Jun 2009 10:00:14 +0000 (12:00 +0200)

Trivial merge