Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 25 Oct 2010 12:19:24 +0000 (15:19 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 25 Oct 2010 12:19:24 +0000 (15:19 +0300)
commita19e2b37341cda659fd5544cc1de48bcc0560299
treed2bbbf5fc4736eed30a2db3391a2226541bf6327
parent53369b2804bd3bafa261b54a9c6ca0b13bd45ba3
parent7301597637976c168d4b3a5f4eb79fe1761ccac2
Merge branch 'master' into harmattan