Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
commit408a3c1b3f8a775fb427e4aaedc70e73822c0cb7
authorhjk <qtc-committer@nokia.com>
Fri, 9 Jan 2009 16:58:15 +0000 (9 17:58 +0100)
committerhjk <qtc-committer@nokia.com>
Fri, 9 Jan 2009 16:58:15 +0000 (9 17:58 +0100)
treefaf47ac31b5582c59e2a7f1b32c3a65d77111c85
parentfb8e1bb20549c4d1c7d65bc82a8cb319036edf53
parent05033a9d36b16ff572394cc504b4489c7f0116de
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline