Commit f5baf9f57a360ebac339401e30b75a1cf50a1a55

Con Kolivas 2013-10-18T19:12:13

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