[MREGE]with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Wed, 29 Dec 2010 04:49:56 +0000 (10:19 +0530)
committerjam-openerp <jam@tinyerp.com>
Wed, 29 Dec 2010 04:49:56 +0000 (10:19 +0530)
bzr revid: jam@tinyerp.com-20101229044956-fdd62bypsl853b3t


Trivial merge