Merge proposals dependent on lp:~mandel/ubuntuone-client/correct-linux-import

lp:~mandel/ubuntuone-client/correct-linux-import has no merge proposals.