[MERGE]:marketing
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 08:52:43 +0000 (14:22 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 08:52:43 +0000 (14:22 +0530)
bzr revid: apa@tinyerp.com-20120720085243-nowwhegcykak0slq


Trivial merge