[Merge] with trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Tue, 1 Feb 2011 05:34:24 +0000 (11:04 +0530)
committerjam-openerp <jam@tinyerp.com>
Tue, 1 Feb 2011 05:34:24 +0000 (11:04 +0530)
bzr revid: jam@tinyerp.com-20110201053424-n2h0rfs0mtlnt7rd


Trivial merge