Merge branch 'scottjad-master' into usb_usb_fix
authortmk <nobody@nowhere>
Mon, 22 Sep 2014 01:52:27 +0000 (10:52 +0900)
committertmk <nobody@nowhere>
Mon, 22 Sep 2014 01:52:27 +0000 (10:52 +0900)

Trivial merge
Imprint / Impressum