OpenERP Community Backports (Server)

Merge proposals dependent on lp://staging/~openerp-community/ocb-server/trunk-bugfix-1053511

  1. trunk-bugfix-1053511
  2. Dependent merge proposals

lp://staging/~openerp-community/ocb-server/trunk-bugfix-1053511 has no merge proposals.