Merge proposals dependent on lp://staging/~onehundredthirty/bzr-fastimport/mirroring-only-debian-dir

1. mirroring-only-debian-dir
2. Dependent merge proposals