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