Commit b2b0d10a00f084a23a7dd10fd9c4fcee7e0e38f9

Con Kolivas 2013-02-28T23:37:06

Merge branch 'master' into usb-dev