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

Conflicts:

	PciIds/Startup.pm

diff --cc PciIds/Startup.pm
index 04b89456900d0cd6026f48448b75567ad3d6a3ca,ee7d9dba96d1645325dbf202f83bea57e1462646..2bacade7178c57faf0077df25889bc3e2d79fd74
--- 1/PciIds/Startup.pm
--- 2/PciIds/Startup.pm
+++ b/PciIds/Startup.pm
@@@ -22,7 -22,7 +22,7 @@@ use warnings
  use base 'Exporter';
  
  #Where are data?
- our $directory = '/home/pciids/ids/perl/cf/';
 -our $directory = '/home/vorner/prog/pciids/';
++our $directory = '/home/pciids/ids/perl/';
  our @EXPORT=qw($directory);
  
  #Where are the modules?