Merge proposals dependent on lp://qastaging/~debian-bazaar/debian/sid/loggerhead/experimental

1. Sid (98)
2. experimental
3. Dependent merge proposals