[MERGE] with trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Mon, 31 Jan 2011 04:25:41 +0000 (09:55 +0530)
committerjam-openerp <jam@tinyerp.com>
Mon, 31 Jan 2011 04:25:41 +0000 (09:55 +0530)
bzr revid: jam@tinyerp.com-20110131042541-4v3nqorriw99hpcq


Trivial merge