Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Jul 2010 05:22:42 +0000 (08:22 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Jul 2010 05:22:42 +0000 (08:22 +0300)
commit89703ce1a0fe450a0397fcdca07cef3c9b99a73a
treee1f1d898bb30835906c962d4358ad3ddf9efbbc6
parentf368ff5e9790d4cea51419bc6990f529fc63e1a5
parent3be3170dcae2b75db4a7059ad0c72cc1f36f355c
Merge branch 'master' into harmattan
server/server.pro