[MERGE] Merge with trunk addons branch main
authormra (Open ERP) <mra@tinyerp.com>
Wed, 5 May 2010 13:34:57 +0000 (19:04 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Wed, 5 May 2010 13:34:57 +0000 (19:04 +0530)
commitd288de05cd178f00b0c8539ca01ba48bee64f72c
tree99b2ed28f1e39d5c7a4c3a7dab64cc39e2cd0fc3
parent478691fa5fdea1d7295050fd69a7211fd56ab91e
parentab6963608096e97183a5dad898084c3051a53372
[MERGE] Merge with trunk addons branch main

bzr revid: mra@tinyerp.com-20100505133457-8rldckwuofivhano