Ubuntu One Control Panel

Merge proposals dependent on lp://qastaging/~dobey/ubuntuone-control-panel/update-4-2

  1. update-4-2
  2. Dependent merge proposals

lp://qastaging/~dobey/ubuntuone-control-panel/update-4-2 has no merge proposals.