Merge with git+ssh://git.ucw.cz/home/mj/GIT/pciutils.git

I have decided to drop the network-related changes from ChangeLog
to avoid merging conflicts.

diff --cc ChangeLog
Simple merge

diff --cc lib/names.c
Simple merge