Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 4 May 2011 05:57:11 +0000 (08:57 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 4 May 2011 05:57:11 +0000 (08:57 +0300)
commit3fd0e998558f589f5fb4d2cdc2deefb0ac583203
tree2bdf5dae3c3cba49d405c428dd5c58fd3550f538
parent7b39198101b99e62613c93aa2c995ecc178915c2
parent34bd93dd0e157b11a3e3f6bfec74686a2437137b
Merge branch 'master' into harmattan