OpenERP

Merge proposals dependent on lp://qastaging/~openerp/openerp/win-installer-trunk

  1. win-installer-trunk
  2. Dependent merge proposals

lp://qastaging/~openerp/openerp/win-installer-trunk has no merge proposals.