merge lp:~openerp-dev/openobject-addons/trunk-clean-search-hr_evaluation-tpa
authorJigar Amin - OpenERP <jam@tinyerp.com>
Mon, 23 Jul 2012 12:46:26 +0000 (18:16 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Mon, 23 Jul 2012 12:46:26 +0000 (18:16 +0530)
bzr revid: jam@tinyerp.com-20120723124626-71e36qshl6r4nwaf


Trivial merge