Merge proposals dependent on lp://qastaging/~packagekit/packagekit/ubuntu-lucid-fix-encoding

1. ubuntu-lucid-fix-encoding
2. Dependent merge proposals