Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 21 Jun 2011 06:58:25 +0000 (09:58 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 21 Jun 2011 06:58:25 +0000 (09:58 +0300)
commit5f669c4b49938c98e42d1fbdaa11bbb5ba6bb204
treea2c538a5a398398c47ffef2f4250e42b932ffa80
parent91536d268a238f19cf60c8039c94c1b7a7d4e82f
parent5f57250c92474ea43b649849eed6f78531b1abd0
Merge branch 'master' into harmattan