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