[MERGE] second and last phase of new import
authorXavier Morel <xmo@openerp.com>
Wed, 10 Oct 2012 15:51:01 +0000 (17:51 +0200)
committerXavier Morel <xmo@openerp.com>
Wed, 10 Oct 2012 15:51:01 +0000 (17:51 +0200)
bzr revid: xmo@openerp.com-20121010155101-fs38ceua1mp7rw6z


Trivial merge