[MERGE] Merge with dev-addons3
authorpsi (Open ERP) <psi@tinyerp.co.in>
Thu, 24 Jun 2010 11:43:32 +0000 (17:13 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Thu, 24 Jun 2010 11:43:32 +0000 (17:13 +0530)
commit6e46b709e29341d3c22fcf7aeb9a6ee15a1a703f
tree0ce0fd8a35533bf493667e2b2ed106a27012460f
parentd86aaa3ee7e73ec19667bfc088b907e15afe246e
parent8b2af5972f7c86295db6cef0c6cac622a7b63bb2
[MERGE] Merge with dev-addons3

bzr revid: psi@tinyerp.co.in-20100624114332-kq8q3hcww7wx9ftx