[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)
bzr revid: jam@tinyerp.com-20110119120635-mf3xjyprgpphl6dj


Trivial merge