[Merge]with: lp:~openerp-dev/openobject-addons/trunk-configuration-imp-dbr