Merge
authorDhara (OpenERP) <>
Fri, 6 Jan 2012 06:50:19 +0000 (12:20 +0530)
committerDhara (OpenERP) <>
Fri, 6 Jan 2012 06:50:19 +0000 (12:20 +0530)
bzr revid: dhara_openerp-20120106065019-qvsider94itsokp4


Trivial merge