Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
commit81b0ddf86c2f403b7e4df105f94f5e967d707a15
authorhjk <qtc-committer@nokia.com>
Mon, 26 Jan 2009 14:27:40 +0000 (26 15:27 +0100)
committerhjk <qtc-committer@nokia.com>
Mon, 26 Jan 2009 14:27:40 +0000 (26 15:27 +0100)
treee8d97c0d4b1b295fc1e6c3617f9d557741906fc6
parent64f2d9f3d61dceaea47b7e9ddfd710b5aebb28f9
parent6f2da75dcba8f3c30c7552ecfa906ec6d76b6228
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline