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