[Nut-upsdev] Backporting changes from the trunk

[Charles Lepple]

When backporting a change from the trunk to the testing branch, please
mention the original revision number of that changeset in your commit
message.

I realize all of our changes are not yet ready for the testing branch,
but it makes it difficult to tell whether anything has been missed if
you don't mention the revision number of the old change.

thanks,

-- 
- Charles Lepple