[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Thu, 27 Jan 2011 05:04:32 +0000 (10:34 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Thu, 27 Jan 2011 05:04:32 +0000 (10:34 +0530)
bzr revid: rpa@tinyerp.com-20110127050432-1crz6pkqo77v0ejw


Trivial merge