[MERGE]:lp:~openerp-commiter/openobject-addons/trunk-add-placeholder-apa-partner-hsa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 31 May 2012 11:28:18 +0000 (16:58 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 31 May 2012 11:28:18 +0000 (16:58 +0530)
bzr revid: apa@tinyerp.com-20120531112818-w3mbst7trsoiqqo5


Trivial merge