[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)
bzr revid: ysa@tinyerp.co.in-20100423053234-7ch94hxej84oj3vb


Trivial merge