Commit 9d29e0940a4aa760543dd414583e360d91d563d2

Con Kolivas 2013-10-13T15:54:32

Merge branch 'master' into libusbx