Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 23 May 2011 08:16:40 +0000 (11:16 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 23 May 2011 08:16:40 +0000 (11:16 +0300)
commit2355994424222b363efb2cb5717cf39e785f3988
tree3c2f28e89a5c3afa22ceecd9e60358e45656cd04
parentd5ecdc134a4f91e34ef181ea5af97f3613951081
parent7b79416b94bc84c1771693d3dc203fddbe726b89
Merge branch 'master' into harmattan