Merge commit 'eec1a86' into cg_merges_20130606a

Conflicts:
	usbutils.c
	usbutils.h

driver-avalon.h

@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Avalon project
+ * Copyright 2013 Con Kolivas
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free