[MERGE] Merge with lp:openobject-addons
authorsbh (Open ERP) <sbh@tinyerp.com>
Thu, 16 Sep 2010 09:19:16 +0000 (14:49 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Thu, 16 Sep 2010 09:19:16 +0000 (14:49 +0530)
bzr revid: sbh@tinyerp.com-20100916091916-jxpuz325aov5dbm1


Trivial merge