[Merge]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Wed, 1 Sep 2010 05:04:47 +0000 (10:34 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Wed, 1 Sep 2010 05:04:47 +0000 (10:34 +0530)
bzr revid: hmo@tinyerp.com-20100831132922-1khv11zfcalejv71
bzr revid: rpa@tinyerp.com-20100901050447-xpw788a5r3bsljoj


Trivial merge