Commit 5c1f3b36d64403316001c44b947be393654a2845

Con Kolivas 2013-02-05T21:34:58

Merge branch 'master' into usb-dev