Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 18 Jan 2011 09:06:32 +0000 (11:06 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 18 Jan 2011 09:06:32 +0000 (11:06 +0200)
commit7218ab5943bd6105b25d3c31a0a7d767b3dd56bc
tree480c8bbc6ff99cc55091d3114ef8be3ed80d86a4
parentea6029ba5360e6f7ffe50f34605f14798fde8eba
parent2392272238ed94b0095f9128b6f45aec3726926a
Merge branch 'master' into harmattan