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