[MERGE] MERGE with lp:openobject-addons
authorsbh (Open ERP) <sbh@tinyerp.com>
Thu, 18 Nov 2010 03:47:14 +0000 (09:17 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Thu, 18 Nov 2010 03:47:14 +0000 (09:17 +0530)
commiteb2fc05914db5897cf03c130fc3c8784af6b8cc4
tree2a787548c0a508ca75769c6d1b88c001fbaa6093
parentcd3ad5248d8bf958507a55c09085a86a2a728b54
parent7eedada6ef95f03b9adc042d6c71ab59b38b8aca
[MERGE] MERGE with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20101118034714-yurvk3vtq119rdlz