[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Tue, 23 Nov 2010 04:48:11 +0000 (10:18 +0530)
committerjam-openerp <jam@tinyerp.com>
Tue, 23 Nov 2010 04:48:11 +0000 (10:18 +0530)
bzr revid: jam@tinyerp.com-20101123044811-ko4t3wbej3hjdsw4


Trivial merge