[MERGE] Merge with lp:openobject-addons
authorsbh (Open ERP) <sbh@tinyerp.com>
Fri, 12 Nov 2010 05:03:14 +0000 (10:33 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Fri, 12 Nov 2010 05:03:14 +0000 (10:33 +0530)
commitad438a09425162e8557ac903bc706088c83e0cfd
treeb161e0d3f30d7302c04589c820c78e5b27173e98
parent8033d13deb44cfb61ad37f2fef28b7c16c782fe6
parent306d4d26e79b10ac48e8aa54c4d9560e274e063e
[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20101112050314-4lvi0w3nn31vq370