Commit 73343f38bc29afb9a4bbe57d2f283a88f2a5027c

Angus Gratton 2013-12-09T11:39:03

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