[MERGE] branch merged with trunk-payroll-salary_rules-psi
authormtr <mtr@mtr>
Mon, 21 Mar 2011 10:42:14 +0000 (16:12 +0530)
committermtr <mtr@mtr>
Mon, 21 Mar 2011 10:42:14 +0000 (16:12 +0530)
commitb482217d341a20d74c8536329eb350c61a811956
tree5843d9e95d7a8703af5e0d04bb7aceecd544d63a
parenteffc9a5e9656f55aad90054fdaacc2f0092ef486
parent8a3cd9df152a114082e3dc5a92580bb85e81fbec
[MERGE] branch merged with trunk-payroll-salary_rules-psi

bzr revid: mtr@mtr-20110321104214-ox224vp73t3btkwj