Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 31 Jan 2011 08:13:47 +0000 (10:13 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 31 Jan 2011 08:13:47 +0000 (10:13 +0200)
commite8a18b0e448f585089d6fcee55fa33fdac3c231c
treef1ecf061658e50322a6a3c520a95a15b99350812
parent2f7cf0ec6a345f388f4df4bdbf87efa3015d3f7c
parente489e9896cd45a417a46ea1d17240fd2b55ca24d
Merge branch 'master' into harmattan