Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
commit62d78bb06244f0b5ba23759c55082626be4c7158
authorhjk <qtc-committer@nokia.com>
Mon, 26 Jan 2009 13:30:29 +0000 (26 14:30 +0100)
committerhjk <qtc-committer@nokia.com>
Mon, 26 Jan 2009 13:30:29 +0000 (26 14:30 +0100)
tree2f547cae0512dae7d9f39434ce96f275d76193b2
parent1a621a9c9e7507679d0d980583f60615c23b3b11
parent191f182ec459e1c34f32ff6edb75a83d7e13cbff
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline