Merge proposals dependent on lp://qastaging/ubuntu/lucid-proposed/ubuntuone-client

1. Lucid (10.04)
2. lucid-proposed
3. Dependent merge proposals