Merge branch 'no_usb_debug_windows'
authorTom Rondeau <trondeau@vt.edu>
Wed, 24 Nov 2010 00:44:58 +0000 (19:44 -0500)
committerTom Rondeau <trondeau@vt.edu>
Wed, 24 Nov 2010 00:44:58 +0000 (19:44 -0500)

Trivial merge