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