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