sync
sync
sync
sync
sync
sync
sync
sync
sync
Merge branch 'master' into todd.udavnew

Conflicts:
	dev/usb/usbdevs.h
	dev/usb/usbdevs_data.h
sync
sync
sync
sync
Merge branch 'master' into todd.udavnew

Conflicts:
	dev/usb/usbdevs.h
	dev/usb/usbdevs_data.h