[MERGE] lp:~openerp-dev/openobject-addons/trunk-red-button-hr-tpa
authorJigar Amin - OpenERP <jam@tinyerp.com>
Thu, 14 Jun 2012 07:28:14 +0000 (12:58 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Thu, 14 Jun 2012 07:28:14 +0000 (12:58 +0530)
bzr revid: jam@tinyerp.com-20120614072814-tiijgb4qg71jfztd


Trivial merge