[MERGE] Merged from the main trunk addons
authorAnup (OpenERP) <ach@tinyerp.com>
Fri, 17 Sep 2010 04:20:43 +0000 (09:50 +0530)
committerAnup (OpenERP) <ach@tinyerp.com>
Fri, 17 Sep 2010 04:20:43 +0000 (09:50 +0530)
commit7cd3b2bef04bd11597d8f5dff28b21998c1a4923
tree3140455e84bc31a22853fa796283f7a99d36b9ca
parentc8e1c459430bda386d98275244eee44060a15915
parentf78c1bd613edb2673aaaaa32d2101707350975bf
[MERGE] Merged from the main trunk addons

bzr revid: ach@tinyerp.com-20100917042043-6r70331avxzfnqg8