[MERGE]with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Mon, 10 Jan 2011 12:43:01 +0000 (18:13 +0530)
committerjam-openerp <jam@tinyerp.com>
Mon, 10 Jan 2011 12:43:01 +0000 (18:13 +0530)
commit96bb720437988fe4a2b6345ba5114882e57fb78d
treec8d2a74b6f8ab40a42c66e4e92fad5a726d19a0b
parent7679874f2ac15da7ac71bdeec541c56621637df4
parent0286d1b8e6f51b1ad204dac425d94a4b5fe8a863
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: jam@tinyerp.com-20110110124301-yn0bq5dr759x9px9