Merge proposals dependent on lp://staging/~vauxoo/openerp-mexico-localization/7.0_oml_tmp_attachment-dev-yzk

1. 7.0_oml_tmp_attachment-dev-yzk
2. Dependent merge proposals