Commit 876e7e589383cd4059f89504eb8334504ed96ed5

Con Kolivas 2013-05-29T00:01:54

Merge branch 'icarus-dev' into usbdev Conflicts: usbutils.h