[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)
commit250d196cb3d527638f1896e6a82de65a6ebd8cb2
treec1bf0430a3a6cc90f7f9806cf022dc867452f4b2
parent1617f7df90ba1356c65272f31fd73f857e0d81e6
parent468631afd780009b6651827cc3376ba21dffba1c
[MERGE] branch merged with trunk-payroll-salary_rules-psi

bzr revid: mtr@mtr-20110317102804-90ohb8ke4n2oio67