Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
commit1108d23cf43760ac97213cc4dcfa450ca46b4e23
authorhjk <qtc-committer@nokia.com>
Tue, 27 Jan 2009 15:08:23 +0000 (27 16:08 +0100)
committerhjk <qtc-committer@nokia.com>
Tue, 27 Jan 2009 15:08:23 +0000 (27 16:08 +0100)
tree9e5758a01317f62ade26cbabcb05f4e60433e882
parent5044d07e6017ff4cb1f1d5be3aaff8133618886e
parentfe4f03caa0f3269797065b1169cdbe76c04a8f36
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline