Merge proposals dependent on lp://staging/~medibuntu-maintainers/medibuntu/non-free-codecs.lucid

1. non-free-codecs.lucid
2. Dependent merge proposals