[MERGE]: Merge with latest trunk-server
authorRucha (Open ERP) <rpa@tinyerp.com>
Mon, 19 Dec 2011 06:22:14 +0000 (11:52 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Mon, 19 Dec 2011 06:22:14 +0000 (11:52 +0530)
commitafb2735412023df7e4e967699332b76e5eea17d3
tree5109ef0a479a1151ce509eeedeb1d2b25cc36a4d
parentaa10c5eb60ca007b2332d02f1e62b0fee6d3590a
parent3b0419ddc8f7334785a2cc1bff35f3a64ac397d2
[MERGE]: Merge with latest trunk-server

bzr revid: rpa@tinyerp.com-20111219062214-1md1y0k594ygzqx5
openerp/tools/yaml_import.py