[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)
commitcedb9505a93fa42c40a3fdb885f900d8e93af376
tree449f4a94529ce07fde2f5d76d630df80b02cb65b
parent91f0e5b0148068c504adceda00ea6969a4442f46
parent7ca289a1b9bfaee49dbc58b11eb91ffa12ba5ff4
[MERGE] Merge with dev-addons3 branch

bzr revid: psi@tinyerp.co.in-20100629121955-fhzkyah74pzjivb5