[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Fri, 10 Dec 2010 04:33:44 +0000 (10:03 +0530)
committerjam-openerp <jam@tinyerp.com>
Fri, 10 Dec 2010 04:33:44 +0000 (10:03 +0530)
bzr revid: jam@tinyerp.com-20101210043344-uq94nq4szvwcznl5


Trivial merge