[MERGE] hr,hr_contract,hr_holidays,hr_recureiment: Merge with ATP branch for YAML
authormra (Open ERP) <mra@tinyerp.com>
Thu, 27 May 2010 12:12:20 +0000 (17:42 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Thu, 27 May 2010 12:12:20 +0000 (17:42 +0530)
commit3106a1bd5b6399873b1165e0ea02c0fd9163baf7
tree64182c9877f96511117cf3b8cc5530ef65aedc76
parentc24832804d67051dc7762b18079418051385bf3c
parentb46561a513de123fbdb0db8c77ac315350bbae2d
[MERGE] hr,hr_contract,hr_holidays,hr_recureiment: Merge with ATP branch for YAML

bzr revid: mra@tinyerp.com-20100527121220-mr11e0tkdv40ybyi