[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)
bzr revid: rpa@tinyerp.com-20111219062214-1md1y0k594ygzqx5

1  2 
openerp/tools/yaml_import.py

Simple merge