Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
commit4b9f407845d7b8ca8fa8d0c44af41c2ccee241d0
authorhjk <qtc-committer@nokia.com>
Tue, 27 Jan 2009 16:11:56 +0000 (27 17:11 +0100)
committerhjk <qtc-committer@nokia.com>
Tue, 27 Jan 2009 16:11:56 +0000 (27 17:11 +0100)
treeb5651c0356f37f458b99c3e1f87eac8ad8bf1ed6
parente3b273bb8f9c3c7897d4e8b08d71cf80484b88c7
parentd22f833a9c08c36b075916dc1cd715d80f9c1039
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline