[Merge]: From trunk addons.
authorrch (Open ERP) <>
Tue, 28 Sep 2010 06:22:18 +0000 (11:52 +0530)
committerrch (Open ERP) <>
Tue, 28 Sep 2010 06:22:18 +0000 (11:52 +0530)
commita4776f2721bf29704ae13a4e20b929b06f3f5a5a
treeb72732e3460f8dc7babc5d3e41b9799179633a4f
parent3b4d9c74d8592e8f02819879a8aaf0086a106f13
parentd83ee9d7ab34bfc8c32f7996f926212e334ba33b
[Merge]: From trunk addons.

bzr revid: rch_open_erp-20100928062218-nmmq3yff7gucw2oq