Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 09:02:38 +0000 (12:02 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 09:02:38 +0000 (12:02 +0300)
commita677586b8471e3c89009fd442e53f90f998b759b
tree9732a757f3d7fa56658cce170448bd01651dc0ad
parent169f6f79440a046c76becefd059eb0fee1b9e00a
parent282f47dd5bf68e25de4b2736704d831a361d8de7
Merge branch 'master' into harmattan