Merge proposals dependent on lp:~olivier-laurent/c2c-addons/trunk-bug1069799

lp:~olivier-laurent/c2c-addons/trunk-bug1069799 has no merge proposals.