Merge branch 'master' into harmattan
authorAbhijit Bera <abhijit.bera@nokia.com>
Sat, 25 Jun 2011 08:38:54 +0000 (14:08 +0530)
committerAbhijit Bera <abhijit.bera@nokia.com>
Sat, 25 Jun 2011 08:38:54 +0000 (14:08 +0530)
commit135a867bcbbd48d48612d414341e59c5bd566cf9
treeef4f616c09c8bea86f5a17989740006c0ac5ee71
parent6c8716affd4cac7a471cdbe9c4c693e14d4080cf
parent5ae743179dc79a828bcc3978ba97f1b01c75df12
Merge branch 'master' into harmattan
common-vars.pri