Ubuntu One Control Panel

Merge proposals dependent on lp://staging/~dobey/ubuntuone-control-panel/update-from-trunk

  1. update-from-trunk
  2. Dependent merge proposals

lp://staging/~dobey/ubuntuone-control-panel/update-from-trunk has no merge proposals.