Merge proposals dependent on lp:~ian-clatworthy/bzr/log-file-tweaks

lp:~ian-clatworthy/bzr/log-file-tweaks has no merge proposals.