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