[MERGE] Merge with dev-addons3 branch
authorpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 29 Jun 2010 12:19:55 +0000 (17:49 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 29 Jun 2010 12:19:55 +0000 (17:49 +0530)
bzr revid: psi@tinyerp.co.in-20100629121955-fhzkyah74pzjivb5


Trivial merge