Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 07:50:49 +0000 (10:50 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 07:50:49 +0000 (10:50 +0300)
commit1f9e66ae1d56dc692e163bb187e39dc3be8c0277
treef22b3c49cbff6f542cacdc0576bab0ada727c52c
parentb1f3311bf8378340ad56b571a2374fa3171ff479
parent5696d1ad78907fcc5dad1cd3dd117c2b9994ecbb
Merge branch 'master' into harmattan