Launchpad automatic translations update.
Launchpad automatic translations update.
Merge branch 'master' of bzr::lp:ocb-addons/7.0 into ocb-7.0
Merge branch 'ocb-7.0' of github.com:akretion/openerp-addons into ocb-7.0