Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 18 Jan 2011 12:35:44 +0000 (14:35 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 18 Jan 2011 12:35:44 +0000 (14:35 +0200)
commit15a272048d0c60977da04b9a1b7cd7f4ad41e51e
tree8e275602d01757f0a20cdf0fabfbe2dd52f0fb05
parentcc2eed27f0ecc0f8ad440dc3e3d974fc3ad83f10
parent4b41a50ad68d8feda6b433a2013aadd78020afa0
Merge branch 'master' into harmattan