Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 7 Dec 2010 09:34:57 +0000 (11:34 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 7 Dec 2010 09:34:57 +0000 (11:34 +0200)
commita459faa5536c4acbe852bd3c6cada24ad5a2160e
tree5243871780416cc0aa06c5f65f4d3f97bda80395
parentdc903723c87fcfd6dd20b175587891fe1ea8623b
parent3c7d1bacc0242e2b48530e8ceeadfc9ea0cb8d98
Merge branch 'master' into harmattan