Comment 4 for bug 1179064

So, I am still working on this. I'm fairly certain we can drop one of the two changes that we're holding. Given how much bzr chokes on this merge it would be a huge win for us. I've pinged Kees to confirm that his old vs new text means it's okay to drop. If that works, I'll propose a merge and then see if we can get the remaining change upstreamed too.