Merge proposals dependent on lp://qastaging/~francois-ctrlaltdel/charms/precise/openerp-web/fix-config-changed

lp://qastaging/~francois-ctrlaltdel/charms/precise/openerp-web/fix-config-changed has no merge proposals.