[MERGE] merged with parent branch of customer portal lp:~openerp-dev/openobject-addons/trunk-customer_portal-atp
bzr revid: bde@tinyerp.com-20120411104743-jiscuasz31jhvftc
This commit is contained in:
bzr revid: bde@tinyerp.com-20120411104743-jiscuasz31jhvftc