[MERGE]: Merge with lp:~daniel-watkins-credativ/openobject-addons/crm_max_fix for...
authorrpa (Open ERP) <rpa@tinyerp.com>
Mon, 6 Sep 2010 13:30:58 +0000 (19:00 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Mon, 6 Sep 2010 13:30:58 +0000 (19:00 +0530)
bzr revid: rpa@tinyerp.com-20100906133058-urm8mu7p0eo8wyuc


Trivial merge