Merge commit 'a52ec33' into cg_merges_20130822a

Conflicts:
	miner.c

miner.c

@@ -1947,32 +1947,32 @@ extern const char *opt_argv0;
 static char *opt_verusage_and_exit(const char *extra)
 {
 	printf("%s\nBuilt with "
-#ifdef HAVE_OPENCL
-		"GPU "
+#ifdef USE_AVALON
+		"avalon "
+#endif
+#ifdef USE_BITFORCE
+		"bitforce "
 #endif
 #ifdef WANT_CPUMINE
 		"CPU "
 #endif
-#ifdef USE_BITFORCE
-		"bitforce "
+#ifdef HAVE_OPENCL
+		"GPU "
 #endif
 #ifdef USE_ICARUS
 		"icarus "
 #endif
-#ifdef USE_AVALON
-		"avalon "
-#endif
 #ifdef USE_MODMINER
 		"modminer "
 #endif
+#ifdef USE_SCRYPT
+		"scrypt "
+#endif
 #ifdef USE_X6500
 		"x6500 "
 #endif
 #ifdef USE_ZTEX
 		"ztex "
-#endif
-#ifdef USE_SCRYPT
-		"scrypt "
 #endif
 		"mining support.\n"
 		, packagename);