Merge branch 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata into RHEL5
authorKH <karsten@dell.bitnap.de>
Fri, 7 Nov 2008 16:52:50 +0000 (17:52 +0100)
committerKH <karsten@dell.bitnap.de>
Fri, 7 Nov 2008 16:52:50 +0000 (17:52 +0100)
commit2bc0d8e784c10698ded8c084ab75ecec758d4811
treed2b84760c5d93cb8fc404fa540c5053e8e7a934b
parente36e98d51b54326c32f6e5dfff10ca0ba52ce7f4
parentbe8cb0907002914ec47832fd842e803668c7b3ef
Merge branch 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata into RHEL5

Conflicts:

hwdata.spec
pci.ids
usb.ids
pci.ids
usb.ids