Merge branch 'master' into harmattan
authorAbhijit Bera <abhijit.bera@nokia.com>
Wed, 9 Feb 2011 10:00:33 +0000 (15:30 +0530)
committerAbhijit Bera <abhijit.bera@nokia.com>
Wed, 9 Feb 2011 10:00:33 +0000 (15:30 +0530)
commit7b6e1bde75f2e53521983fc162a9a26c1b1cab72
tree2625fc91cbd1893f40c243efff8e01b56a4a25e3
parentd6a25829115b1fcd90ead5311ab16cba04f020ea
parent4b7fc5f940574ee0904b159778efc620f18e5e61
Merge branch 'master' into harmattan