[MERGE] Merge with lp:openobject-addons
authorsbh (Open ERP) <sbh@tinyerp.com>
Tue, 16 Nov 2010 04:54:25 +0000 (10:24 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Tue, 16 Nov 2010 04:54:25 +0000 (10:24 +0530)
bzr revid: sbh@tinyerp.com-20101116045425-9t7snpmdmd6q00rm


Trivial merge