Merge proposals dependent on lp:~chipaca/ubuntuone-client/fix-menu-items

lp:~chipaca/ubuntuone-client/fix-menu-items has no merge proposals.