Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
authorMarkku Luukkainen <markku.luukkainen@digia.com>
Thu, 18 Jun 2009 15:24:20 +0000 (17:24 +0200)
committerMarkku Luukkainen <markku.luukkainen@digia.com>
Thu, 18 Jun 2009 15:24:20 +0000 (17:24 +0200)
commit4cfb8cf1e8457712c1df1b0ce2e55a5488b6ca22
treee844f2b939999887bdadef9c130ca27a7be3bc9e
parent829307fa214586d40ff13d9e9eb4ece4d1bd4ff1
parent402acf14686738a20b184b646a3211a7633995a0
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public