Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 15 Jun 2010 09:16:07 +0000 (12:16 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 15 Jun 2010 09:16:07 +0000 (12:16 +0300)
commitf98b3912d46828a74f6824643d3a42f218cfa667
treef1cf3577fa57786f82e656d684ec2eec569041a5
parentcc95a762da5c83b10890fd8d807df8237eef5716
parent91cb7e2b31761eb941c3cfd51a8c88aa56e33c0a
Merge branch 'master' into harmattan