Merge proposals dependent on lp:~patrick-hetu/charms/oneiric/openerp-web/trunk

lp:~patrick-hetu/charms/oneiric/openerp-web/trunk has no merge proposals.