sync up with both the -dj and cvs version of the usb-storage code.
Attach a file by drag & drop or click to upload
