[MERGE] branch merged with trunk-payroll
authormtr <mtr@mtr>
Wed, 13 Apr 2011 06:01:40 +0000 (11:31 +0530)
committermtr <mtr@mtr>
Wed, 13 Apr 2011 06:01:40 +0000 (11:31 +0530)
bzr revid: mtr@mtr-20110412045612-7bny7k331a0y2ree
bzr revid: mtr@mtr-20110412052754-7q392mf48cv0xg9b
bzr revid: mtr@mtr-20110413060140-nhu313xpavd5sv2m


Trivial merge