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