merge

bin/addons/base/i18n/fr.po

bin/addons/base/ir/ir_actions.py

bin/addons/base/ir/ir_ui_menu.py

bin/addons/base/maintenance/maintenance_view.xml

bin/addons/base/res/config_pixmaps/1.png

bin/addons/base/res/config_pixmaps/2.png

bin/addons/base/res/config_pixmaps/3.png

bin/addons/base/res/partner/partner.py

bin/addons/base/res/res_log.py

bin/osv/fields.py

bin/osv/orm.py

bin/tools/convert.py

bin/tools/yaml_import.py