Fix: Bumb version
Merge branch 'master' into dev
Release openerp6.1-rev2013021401
Merge branch 'release_openerp6.1-rev2013021401'