Commit c3b056624708333cd1fdfaa87fa8bc0e16a33478

Con Kolivas 2013-10-14T12:58:30

Merge branch 'master' into libusbx