Commit 853aa28ffc1939b7939841e72cd99e2f8345e4d4

Con Kolivas 2013-10-11T08:49:59

Merge branch 'master' into async Conflicts: usbutils.c