Commit 293622cf2a8a74859de8a8264d0e2e6e8e4c2f9a

Con Kolivas 2013-09-22T22:54:18

Merge branch 'master' into hashfast Conflicts: usbutils.c usbutils.h