Merge proposals dependent on lp://staging/~dobey/ubuntuone-control-panel/use-dirspec

lp://staging/~dobey/ubuntuone-control-panel/use-dirspec has no merge proposals.