Comment 4 for bug 342170

Stepping up to the plate to get git-upstream fixes into something the Ubuntu people can work with -and- help reduce the chatter on bzr's bug reports about the deprecated warnings.