Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 4 May 2011 10:54:14 +0000 (13:54 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 4 May 2011 10:54:14 +0000 (13:54 +0300)
commit956cd3c272c78474231800095292a974c260cba8
treeab5e39be3c201b36fb207aacf6950eeeb5fb45ce
parent507ee60d6029c4d715787a1c00180166d3928f6b
parent43ee6297260b7aa66e8598f9b8d12c769141fe80
Merge branch 'master' into harmattan