[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Fri, 31 Dec 2010 08:28:49 +0000 (13:58 +0530)
committerjam-openerp <jam@tinyerp.com>
Fri, 31 Dec 2010 08:28:49 +0000 (13:58 +0530)
commit951754060d2308ec6721fe5b0c887bf1880eb4d1
treedd84dbcf3cbaf6034dca727478644229a7652efa
parentef644ffe46a17647121e09895d0f9ba7d35a62db
parent93c221d29603ba5f0213fd21de94bf72f21bf14b
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: jam@tinyerp.com-20101231072542-70a11o30k1cek98b
bzr revid: jam@tinyerp.com-20101231082849-acysabn1q0cw8wgq