Merge branch 'master' into libusb-1.0
authorThomas Tsou <ttsou@vt.edu>
Sat, 3 Oct 2009 20:33:11 +0000 (16:33 -0400)
committerThomas Tsou <ttsou@vt.edu>
Sat, 3 Oct 2009 20:33:11 +0000 (16:33 -0400)

Trivial merge