Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 25 Oct 2010 08:43:54 +0000 (11:43 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 25 Oct 2010 08:43:54 +0000 (11:43 +0300)
commita62d04884009a7947991059061d070db33eb051a
tree637879d79a7462ca2d70865bea02b8d48e730b1a
parent5824105d4b455294ce562b2c1d427917ea942dd7
parent24ee4d52b1ffd66bee15753f1b1a3d9831d29df2
Merge branch 'master' into harmattan