Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 7 Apr 2010 10:50:35 +0000 (13:50 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 7 Apr 2010 10:50:35 +0000 (13:50 +0300)
commita9b0b7c3398f39607402dfb44fc1685174989a99
tree44952b1487e54e327d8582e0a33c31a016510a8c
parent749189b928475d783c3dfd8a2127b94329ac952a
parentd64c1f115b9833c15a30f804824f67d03cc06628
Merge branch 'master' into harmattan