Merge change I935c71f2 into eclair

* changes:
  Add sholes to Windows USB Driver in Eclair.