OpenERP Community Backports (Addons)

Merge proposals dependent on lp://staging/~mileo/ocb-addons/rs-ocb-70-bug-1201472

  1. rs-ocb-70-bug-1201472
  2. Dependent merge proposals

lp://staging/~mileo/ocb-addons/rs-ocb-70-bug-1201472 has no merge proposals.