Merge branch 'for-greg' of git://gitorious.org/usb/usb into work