Release openerp6.1-rev2013040400
Merge branch 'release_openerp6.1-rev2013040400' into dev