[MERGE] branch merged with trunk-payroll-india-mra
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 16 Jul 2012 09:27:50 +0000 (14:57 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 16 Jul 2012 09:27:50 +0000 (14:57 +0530)
bzr revid: mtr@tinyerp.com-20120716092750-0deyjpp1xcly08h2


Trivial merge