Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 15 Feb 2011 11:15:00 +0000 (13:15 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 15 Feb 2011 11:15:00 +0000 (13:15 +0200)
commitd9bc18a03ae5fb5542361295de03fa796400b280
tree0f0ea85e604cc5a2bbc4214a2f86d2f948ec30dd
parent1bba531ad85bd2dc571e4054a82637cb5919d087
parent0c4f26cb1b3a8c62ed253b852d3bbc943f6f8a5b
Merge branch 'master' into harmattan