Merge git://github.com/the-tcpdump-group/tcpdump

"Please enter a commit message to explain why this merge is necessary" -
because Git appears to think it is, for some reason, otherwise it
wouldn't have told me to enter that message.