OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 2 Mar 2009 11:28:32 +0000 (12:28 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 2 Mar 2009 11:28:32 +0000 (12:28 +0100)

Trivial merge