Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 17 Feb 2011 13:15:13 +0000 (15:15 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 17 Feb 2011 13:15:13 +0000 (15:15 +0200)
commite8754cdedd7562239c8dabd1fdb094500a47091d
tree6567b7060f54a95f80b697180f2e4a4459fb114d
parent2c15a5d8be1a5bb18f54fb4ff97fa12b40e625cf
parent20915c533854cd419821f56775d50a80d7636671
Merge branch 'master' into harmattan