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