[MERGE] with trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Wed, 19 Jan 2011 12:06:35 +0000 (17:36 +0530)
committerjam-openerp <jam@tinyerp.com>
Wed, 19 Jan 2011 12:06:35 +0000 (17:36 +0530)
commit1c18f4c17c8cfbd6e150a943adbb58f6d1476fb6
treefc0d112de30be52203caa877e819d5987e9fd4d7
parent0dfbaaf721d00b11fc2d728830d6e9b8f6d6f947
parentc2310c8ec915eacb66fa4dc14c4f5eeedba88fec
[MERGE] with  trunk-dev-addons1

bzr revid: jam@tinyerp.com-20110119120635-mf3xjyprgpphl6dj