[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)
commitec92011fcd6c62b150d36e45af68e16d9d5a8569
tree7a77b6cd711bf2b415674b225927c059fb67d5dd
parent8642e348467b4a2055fb18b5c843b52966c8018c
parentdf77cd160ee1a52f162a6c1c84aa0d5203e545e1
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: jam@tinyerp.com-20101125052241-45bw91ssb4xivu6k