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