Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
commit5327316feb32e2ae2867b4bcdc98b62035caa00c
authorhjk <qtc-committer@nokia.com>
Fri, 23 Jan 2009 17:30:27 +0000 (23 18:30 +0100)
committerhjk <qtc-committer@nokia.com>
Fri, 23 Jan 2009 17:30:27 +0000 (23 18:30 +0100)
treed1c88551dd89c38d55b6aad0dcb6ef26e49a1573
parent15ac83eda44a0b089834f56d4d07ec5d5eb6b162
parent4bca9d3d3485a8b41fd622b29c8f5306478da1b1
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline