Merge branch 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata into RHEL5

Conflicts:

	hwdata.spec
	pci.ids
	usb.ids

diff --cc pci.ids
Simple merge

diff --cc usb.ids
index 93f5bccad54c1997ca74954b85159856facad11d,073ba88a7274cee5e83c36ed3befa88dc8c0f240..0664e008a6da4a704dca9f8492077ba6e83c2ddf
--- 1/usb.ids
--- 2/usb.ids
+++ b/usb.ids
@@@ -1,5 -1,5 +1,5 @@@
  #
--#     List of USB ID's
++#     List of USB ID's
  #
  #     Maintained by Stephen J. Gowdy <sgowdy+usb.ids@gmail.com>
  #     If you have any new entries, send them to the maintainer.