Merge proposals dependent on lp:~brian-murray/ubuntu/oneiric/plymouth/bug-860371

1. Oneiric (11.10)
2. bug-860371
3. Dependent merge proposals