[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Thu, 3 Jun 2010 11:20:42 +0000 (16:50 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Thu, 3 Jun 2010 11:20:42 +0000 (16:50 +0530)
commit7f3a150857a10967769d59701ee0768d52c2dd67
tree785bfede76a2fe7c81ff90d5912a8b4b3129b3d9
parent7355b9226e153a0c33c69a34b76bf69c91d233ab
parent859b9b84c56f5d197c8f01046ae844758cd5ff6a
[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100603112042-v3lry4z73v89s4el