[MERGE] merge from lp:~openerp/openobject-addons/trunk/
authorHarry (Open ERP) <hmo@tinyerp.com>
Thu, 25 Mar 2010 05:29:15 +0000 (10:59 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Thu, 25 Mar 2010 05:29:15 +0000 (10:59 +0530)
commit1eeeda525eb533c568f63e29d5d790298238d63a
tree23ceae2fbb3389432c330dd93e11cd276a5c3695
parent63449811c20e8e1e09bee64bba5672b51c514d01
parentf0bfaff07a0338d7cce317e767d36aa83cbc3913
[MERGE] merge from lp:~openerp/openobject-addons/trunk/

bzr revid: hmo@tinyerp.com-20100325052915-kn5nnwxk06yr9i68
addons/auction/__terp__.py
addons/delivery/__terp__.py
addons/purchase/__terp__.py