Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
commitf73861d458f62d9b1d69d934b2f451c5755b0e55
authorhjk <qtc-committer@nokia.com>
Wed, 21 Jan 2009 13:00:06 +0000 (21 14:00 +0100)
committerhjk <qtc-committer@nokia.com>
Wed, 21 Jan 2009 13:00:06 +0000 (21 14:00 +0100)
treedd5d991086718d4a1c11dc582d18bb74baba7a3c
parent47f4ccada7c70b8cce2a46872a26c572f6ac60d4
parent5b50ffc20db6fe13ab4926d706bb40e3ddc08cda
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline