[MERGE]: Merging with the same branch
authorrpa (Open ERP) <rpa@tinyerp.com>
Wed, 22 Dec 2010 04:18:55 +0000 (09:48 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Wed, 22 Dec 2010 04:18:55 +0000 (09:48 +0530)
bzr revid: rpa@tinyerp.com-20101222041855-qu0jo8139sq27ltu

1  2 
addons/purchase/purchase_view.xml

Simple merge