Commit e933a5602bc95106f826054e8a629497e0d57831

Angus Gratton 2013-11-30T22:03:26

Merge remote-tracking branch 'upstream' into merge_383 Conflicts: usbutils.c usbutils.h