Commit 6bf79626b86ce12f5ee044c077164f5d65cebe77

Con Kolivas 2013-02-23T13:59:37

Merge branch 'master' into usb-dev