Launchpad automatic translations update.
Launchpad automatic translations update.
Merge branch 'bzr/openerp-web-7.0'
Merge branch 'bzr/openobject-addons-7.0'