Merge proposals dependent on lp://staging/~ubuntu-developer-manual/ubuntu-developer-manual/bazaar

1. bazaar
2. Dependent merge proposals