[MERGE] merge with dev-addons3 branch
authorpsi (Open ERP) <psi@tinyerp.co.in>
Thu, 27 May 2010 06:48:27 +0000 (12:18 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Thu, 27 May 2010 06:48:27 +0000 (12:18 +0530)
commit207ee965da7b249efe174f3b8148f246a1e4da55
treee56157c7137a3ca82ec058a7900a113b4899ca7b
parent6802a4781591bd702fb9a96b4cae455737afd7a4
parentf2404834221799662de3c593525ba3624d0d3202
[MERGE] merge with dev-addons3 branch

bzr revid: psi@tinyerp.co.in-20100527064827-f2ozbjrc4s6opz76