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