Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Mon, 25 Apr 2011 07:47:59 +0000 (13:17 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Mon, 25 Apr 2011 07:47:59 +0000 (13:17 +0530)
commit9993f908937c25c4217c6a66f36f187b55993442
treebb6f8869f67ddece924b5a8b0623e58d86431b77
parentf74481188f536dbd5c5e34d31f1cc28c1b0fd809
parent333154f999a45ab1ff5b405c2ca8959d38fd6fba
Merge branch 'master' into harmattan