[MERGE] merge with dev-addons3 branch
authorpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 8 Jun 2010 06:22:45 +0000 (11:52 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 8 Jun 2010 06:22:45 +0000 (11:52 +0530)
commit113b7cb2b9c76d6aad7ff19c85bfaece8ecc447d
tree03ff3552890576b070ca6b8b4b4f05b09c7df9f7
parent64d5da9c71878340cc1da5c5c85f40ef43cf9eb6
parent27f8b1748fac98da5b3edc4c8f83cd55abb9e13e
[MERGE] merge with dev-addons3 branch

bzr revid: psi@tinyerp.co.in-20100608062245-lsqqcuqgi2aifq31