[MERGE] Merge with dev-addons3 branch
authorpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 29 Jun 2010 06:51:32 +0000 (12:21 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 29 Jun 2010 06:51:32 +0000 (12:21 +0530)
commit91f0e5b0148068c504adceda00ea6969a4442f46
treee6dc5c18b1b165e32e8ef108a91807e04f6fd465
parent6e46b709e29341d3c22fcf7aeb9a6ee15a1a703f
parent771116aabcd49286dee811e0deac00aee45a9e31
[MERGE] Merge with dev-addons3 branch

bzr revid: psi@tinyerp.co.in-20100629065132-avbkxjiul6zsqk3k