Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 21 Jun 2011 11:20:04 +0000 (14:20 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 21 Jun 2011 11:20:04 +0000 (14:20 +0300)
commit2cb89272ed94390435db6215f393af162329123e
tree268efba3c09dd73d0fc575bb47815a12898db884
parent0719b09f845fd77177a64797fe89407d8562cd51
parent7bb46660e1bfb5880eaf16b3949b240cfc6d72e2
Merge branch 'master' into harmattan