Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 20 May 2010 11:09:27 +0000 (14:09 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 20 May 2010 11:09:27 +0000 (14:09 +0300)
commit621c84e236b2c6b58f0e66d2281072579512e65d
tree774dca3361f1beed1c5e842788075413710831fe
parent33c6f9a3d7a594e6200bf77c5344a68252c7a926
parentddef88506f676fd9356954ab89423f9c1b83dcd5
Merge branch 'master' into harmattan