Commit 2d4a1db57e21d399eac8bb3b901e3dff614be061

Con Kolivas 2013-05-27T14:37:41

Merge branch 'icarus-dev' into avalon-usbdev