Commit c28e2238c67f51abd0081715dd6c4a98f520039b

Con Kolivas 2013-02-10T13:29:25

Merge branch 'master' into usb-dev