Merge proposals dependent on lp://staging/~debbie-beliveau/ubuntu/maverick/ubiquity/ubiquity-depends-fix

1. Maverick (10.10)
2. ubiquity-depends-fix
3. Dependent merge proposals