[MERGE] branch merged with trunk-payroll
authormtr <mtr@mtr>
Wed, 11 May 2011 06:43:27 +0000 (12:13 +0530)
committermtr <mtr@mtr>
Wed, 11 May 2011 06:43:27 +0000 (12:13 +0530)
bzr revid: mtr@mtr-20110511064327-jzwjr10clzh33m37


Trivial merge