Merge proposals dependent on lp://qastaging/~vauxoo/openerp-mexico-localization/7.0-l10n_mx_depends_addons_vauxoo

1. 7.0-l10n_mx_depends_addons_vauxoo
2. Dependent merge proposals