Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 27 Jan 2011 09:32:00 +0000 (11:32 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 27 Jan 2011 09:32:00 +0000 (11:32 +0200)
commit8d09badaf6d67371de0abee184f5ef5bb0de1b1f
treebf9244505ae6c81af9ec1fbfb2d95f03fb901996
parent96680f7f6a60c2872432af146ca0f0f99e40c31e
parent96041705f8ca26f61efaf8be6a21392f78ce86a6
Merge branch 'master' into harmattan