[MERGE] branch merged with trunk-payroll-salary_rules-psi
authormtr <mtr@mtr>
Mon, 14 Mar 2011 06:35:11 +0000 (12:05 +0530)
committermtr <mtr@mtr>
Mon, 14 Mar 2011 06:35:11 +0000 (12:05 +0530)
commit46f2aac28fa6e5ba8e3fdba13ecd5e927ffbf481
treefe035b8f50bfd99fbaa08bbaaf6a1870b3e85b6d
parent62ff4c00d61a57dc9181f333856549fded1c1932
parent743a6fe8eee57bc11884849f84b75a2976f16bb6
[MERGE] branch merged with trunk-payroll-salary_rules-psi

bzr revid: mtr@mtr-20110314063511-owhz4ewy6o3a0pla