Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 29 Apr 2011 14:16:25 +0000 (17:16 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 29 Apr 2011 14:16:25 +0000 (17:16 +0300)
commit925f9cdb3216c226fd11c1962c8b34249f167c77
treed74617f25a476ae1db7c610f18a71b3a41ecd7ba
parent136ca9a95678f15a524601d6352a3dd544e953dd
parentd17077b005345af1f72093b69e4239bbcf200a70
Merge branch 'master' into harmattan