Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Wed, 9 Mar 2011 09:37:43 +0000 (15:07 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Wed, 9 Mar 2011 09:37:43 +0000 (15:07 +0530)
commit9163423b52e8a6712ce64ac7558fc68145266646
tree167d6575f91d9cfe722386cfea74213eb1a22841
parentb1364fe8dc7955a894afd141ccf1e31a80c05ebb
parent47aa5bcf999d78832317367370012ebf6da498b2
Merge branch 'master' into harmattan