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