[MERGE] branch merged with trunk-payroll-salary_rules-psi
authormtr <mtr@mtr>
Thu, 17 Mar 2011 10:28:04 +0000 (15:58 +0530)
committermtr <mtr@mtr>
Thu, 17 Mar 2011 10:28:04 +0000 (15:58 +0530)
bzr revid: mtr@mtr-20110317102804-90ohb8ke4n2oio67


Trivial merge