Merge proposals dependent on lp://qastaging/~vauxoo/openerp-mexico-localization/7.0-l10n_mx_ir_attachment-SUPERUSER_ID-dev-yzk

1. 7.0-l10n_mx_ir_attachment-SUPERUSER_ID-dev-yzk
2. Dependent merge proposals