[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue2_settings-cha