Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 9 Jun 2011 07:28:15 +0000 (10:28 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 9 Jun 2011 07:28:15 +0000 (10:28 +0300)
commitd877204baa0be163b4fa5a33b4128d8757df3816
tree04169f0cb6005f899a4b4c825282120087f97cdf
parente018ec2ebba608ac6e80587cce39e2546d85808a
parentc87ef6047446722431127bd7d73ddce2a1b489bd
Merge branch 'master' into harmattan