Commit 3b266594cb421eda2b0913ec10c8613daf8c049e

Con Kolivas 2013-10-07T14:57:08

Merge branch 'master' into libusbx Conflicts: api.c miner.h usbutils.c