Merge proposals dependent on lp://staging/~mcasadevall/ubuntu-seeds/ubuntu.karmic-fix-non-usplash-archies

1. ubuntu.karmic-fix-non-usplash-archies
2. Dependent merge proposals