Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 17 Feb 2011 13:19:46 +0000 (15:19 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 17 Feb 2011 13:19:46 +0000 (15:19 +0200)
commit6c85ea20388e4cee53b976f641ec3d29e42a1944
treec37496e72bfd8ed497e98b1043c0a721a6e761e8
parent490f98b78fad1288fb0bc292e71f44cc8de79e0d
parentcb87ca2ff3b551de8b68869e3d0e6ce0f1b1449e
Merge branch 'master' into harmattan