[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Thu, 25 Nov 2010 05:22:41 +0000 (10:52 +0530)
committerjam-openerp <jam@tinyerp.com>
Thu, 25 Nov 2010 05:22:41 +0000 (10:52 +0530)
bzr revid: jam@tinyerp.com-20101125052241-45bw91ssb4xivu6k


Trivial merge