Semi-Merge commit '293b94c' into update_avalon_20130524 (move AVA identifier)

Conflicts:
	api.c

api.c

@@ -161,9 +161,6 @@ static const char *SCRYPTSTR = "scrypt";
 static const char *SHA256STR = "sha256";
 
 static const char *DEVICECODE = ""
-#ifdef USE_AVALON
-			"AVA "
-#endif
 #ifdef HAVE_OPENCL
 			"GPU "
 #endif
@@ -173,6 +170,9 @@ static const char *DEVICECODE = ""
 #ifdef USE_ICARUS
 			"ICA "
 #endif
+#ifdef USE_AVALON
+			"AVA "
+#endif
 #ifdef USE_X6500
 			"XBS "
 #endif