[MERGE] Merge with lp:addons
authorsbh (Open ERP) <sbh@tinyerp.com>
Fri, 30 Apr 2010 04:52:04 +0000 (10:22 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Fri, 30 Apr 2010 04:52:04 +0000 (10:22 +0530)
commit2113010824f542c9690e077e0d7601ee88fd22ad
tree7a7cedee1dcf5b253f61b5e8f8e79e3dff85cc29
parentd1e3a35310c06e5482bca332993c52190f991db7
parent7c74f8e6b5c3d23e1f0684c9292652ec730c5e1c
[MERGE] Merge with lp:addons

bzr revid: mso@mso-20100429044245-py7dbq4lfm9ka3sf
bzr revid: sbh@tinyerp.com-20100430045204-8ntqfey9mwxkplgb