Code review comment for lp:~blake-rouse/maas/fix-1378527-1.7-again

I know this is a pain, but you need to cherry-pick the revision from trunk:

    bzr branch lp:maas/1.7 fix-1378527-1.7-again
    cd fix-1378527-1.7-again
    bzr merge -c 3264 lp:maas
    bzr ci -m "Backport r3264 from trunk: $original_commit_message"

This way Bazaar carries the merge markers across, which is what `bzr missing` relies upon afaik.

You're not the first to do this wrong on the 1.7 branch, so I'm approving this, but it would be cool if you could do it "correctly".

Also, I've not done a fine-tooth-comb review of this because I assume it's a straight back-port from trunk, and it was reviewed there.