Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
commitf56869224e1092df5db7ca5b7e60f6b867c51dea
authorhjk <qtc-committer@nokia.com>
Tue, 27 Jan 2009 14:54:46 +0000 (27 15:54 +0100)
committerhjk <qtc-committer@nokia.com>
Tue, 27 Jan 2009 14:54:46 +0000 (27 15:54 +0100)
treecdbdce818ea72496e5ed3d5949e69f749736f877
parent75aaeff2c4acbeb47f0ea85f63fd92f794e3365d
parentce2ad5f2591ab6bd98c957f23054e45f941e820a
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline