[MERGE]: Merge with latest trunk-server
authorRucha (Open ERP) <rpa@tinyerp.com>
Wed, 16 Nov 2011 05:11:10 +0000 (10:41 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Wed, 16 Nov 2011 05:11:10 +0000 (10:41 +0530)
commitaa10c5eb60ca007b2332d02f1e62b0fee6d3590a
tree507d0de1b0a37ddfef5a2c7a70c44902d085d0ec
parent792023dbce147301182fe3e1a6b6b08ca8c25070
parent19e7261bc0a70b46ffd20dcb28c653106fce10f4
[MERGE]: Merge with latest trunk-server

bzr revid: rpa@tinyerp.com-20111116051110-jtb3437w8vu3qhph
openerp/tools/yaml_import.py