[MERGE] Merge hr changes
authorSbh (Openerp) <sbh@tinyerp.com>
Wed, 13 Jun 2012 08:47:45 +0000 (14:17 +0530)
committerSbh (Openerp) <sbh@tinyerp.com>
Wed, 13 Jun 2012 08:47:45 +0000 (14:17 +0530)
bzr revid: sbh@tinyerp.com-20120613084745-wbwnb43okod66qal


Trivial merge