Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
commitb1602738dcf27bed34fc7eb6f08f92c7638530e6
authorhjk <qtc-committer@nokia.com>
Fri, 16 Jan 2009 16:38:24 +0000 (16 17:38 +0100)
committerhjk <qtc-committer@nokia.com>
Fri, 16 Jan 2009 16:38:24 +0000 (16 17:38 +0100)
treed9fb2f843110af3b2c54c9aec9a98be6c030bba4
parent62c2688ce6456e0bce553c53617a8502ba753a75
parent5c2e5ffced2970248fd9d4e94fa25c360e42889f
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline