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