Merge branch 'master' into harmattan
authorprasanna <prasanna@prasanna-OptiPlex-755.(none)>
Fri, 14 Jan 2011 09:59:03 +0000 (15:29 +0530)
committerprasanna <prasanna@prasanna-OptiPlex-755.(none)>
Fri, 14 Jan 2011 09:59:03 +0000 (15:29 +0530)
commit52c8ea1e77c607d3950759ea46af81f586ccbfdf
treed27b24caca7817e2f2940484ff1579b924202234
parent025d6c6994b56be4b52249cb59daa49352bbd783
parent157f5e4f9a004450fffa72b5658517c4dd5eb343
Merge branch 'master' into harmattan