Merge branch 'master' of /home/vorner/pciids

Conflicts:

	scripts/pciids-export

diff --cc scripts/pciids-export
index b8ac82b5b7f1519294edf60283cf552da51b5a8e,695a0c33dfbd8a0ddb48cdae25fdc6cbdaeb14d1..53a4477c40eb341203c99efca1d5a13fff9e359f
--- 1/scripts/pciids-export
--- 2/scripts/pciids-export
+++ b/scripts/pciids-export
@@@ -27,8 -26,13 +26,13 @@@ cat cf/class_head.ids >> ../pci.ids.ne
  ./scripts/export.pl PD >> ../pci.ids.new
  cd ..
  if ! [ -f docs/pci.ids ] || ! cmp docs/pci.ids pci.ids.new >/dev/null ; then
- #     ln -f pci.ids.new ~/origs/00-current
-       ln -f pci.ids.new docs/pci.ids
+       cp perl/cf/head.ids pci.ids.final
+       echo '# Current to date: '`date +%Y%m%d` >> pci.ids.final
+       echo >> pci.ids.final
+       cat pci.ids.new >> pci.ids.final
 -      ln -f pci.ids.final ~/origs/00-current
++#     ln -f pci.ids.final ~/origs/00-current
+       ln -f pci.ids.final docs/pci.ids
+       rm pci.ids.final
        bzip2 -9c <docs/pci.ids >docs/pci.ids.bz2
        gzip -9c <docs/pci.ids >docs/pci.ids.gz
  fi