Merge proposals dependent on lp://staging/~dobey/ubuntu/oneiric/ubuntuone-client-gnome/fix-ftbfs

lp://staging/~dobey/ubuntu/oneiric/ubuntuone-client-gnome/fix-ftbfs has no merge proposals.