Bug#619528: Proposed NMU diff

[Scott Kitterman]

I'll have another look at it and get back to you. I suspect a copy/paste error 
on my part as it built here. Is your planned upload published somewhere? Maybe 
it interacts poorly with one of the other planned changes?