[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Fri, 22 Oct 2010 05:12:17 +0000 (10:42 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Fri, 22 Oct 2010 05:12:17 +0000 (10:42 +0530)
bzr revid: rpa@tinyerp.com-20101022051217-1lui0rbtq9d03n0a


Trivial merge