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

1. 7.0-oml_cr_uid_ids_dev_yzk
2. Dependent merge proposals