Merge branch 'master' into harmattan
authorDevanjan Choudhury <devanjan.choudhury@nokia.com>
Wed, 6 Apr 2011 09:18:44 +0000 (14:48 +0530)
committerDevanjan Choudhury <devanjan.choudhury@nokia.com>
Wed, 6 Apr 2011 09:18:44 +0000 (14:48 +0530)
commit61e107264da839f3a89c83811aa3a5f267bc6877
tree1afccb24cc9dbfa2837350ef8aa290b0aa595de1
parent4d4a9c16cbb407312a70c3f6581cb12693edae10
parent5a1e28c3144798179e3f9c5086f86b1fc17a0521
Merge branch 'master' into harmattan