Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
commit0f18d7aa73e62efc6c87fea38bbaaabde3746c38
authorhjk <qtc-committer@nokia.com>
Mon, 26 Jan 2009 15:19:54 +0000 (26 16:19 +0100)
committerhjk <qtc-committer@nokia.com>
Mon, 26 Jan 2009 15:19:54 +0000 (26 16:19 +0100)
tree711b60f77445d049be589728612b45c68b4f7c11
parentfe0533de2a634ca377c2d8a0073e0eb2cbf89abf
parent8c59160792cd9d1ef4a2273cd6058ad105b92ea5
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline