Merge branch 'release_openerp6.1-rev2013040400' into dev
Fix: Corregido script de geocodificacion masiva
Release openerp6.1-rev2012040401
Merge branch 'release_openerp6.1-rev2012040401'