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