[RVT] Reverting revision
        http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9617
        to resolve conflict with conflict with
        http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9867
        containing an alternative fix for lp:1195094
[RVT] Reverting revision
        http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9617
        to resolve conflict with conflict with
        http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9867
        containing an alternative fix for lp:1195094
Merge branch 'rs-ocb-7.0' of github.com:akretion/openerp-addons into rs-ocb-7.0