Merge proposals dependent on lp:~openerp-dev/openobject-server/trunk-americanization_account_config-ssh

lp:~openerp-dev/openobject-server/trunk-americanization_account_config-ssh has no merge proposals.