[MERGE] merge with lp:openobject-addons
authorYsa (Open ERP) <ysa@tinyerp.co.in>
Fri, 23 Apr 2010 05:32:34 +0000 (11:02 +0530)
committerYsa (Open ERP) <ysa@tinyerp.co.in>
Fri, 23 Apr 2010 05:32:34 +0000 (11:02 +0530)
commit89e2772ce67d84e0228b55a103a15ec4f3d89a0c
tree8ed84c43863414a17f2e816e711839f160346456
parentbbf62704c4b23b3873704cc865cf97347f65d50b
parent5e9e4eaadb71c1f3c5d7617731bf266f0fb289dd
[MERGE] merge with lp:openobject-addons

bzr revid: ysa@tinyerp.co.in-20100423053234-7ch94hxej84oj3vb