Commit 03dff61e54af1e1c8c721cc46273afba2a9005e1

Con Kolivas 2013-02-05T22:00:23

Merge branch 'master' into usb-dev