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