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