Merge commit '74164a3' into cg_merges_20130513

miner.c

@@ -210,7 +210,6 @@ static int api_thr_id;
 static int total_control_threads;
 
 pthread_mutex_t hash_lock;
-static pthread_mutex_t qd_lock;
 static pthread_mutex_t *stgd_lock;
 pthread_mutex_t console_lock;
 pthread_mutex_t ch_lock;
@@ -8284,7 +8283,6 @@ int main(int argc, char *argv[])
 #endif
 
 	mutex_init(&hash_lock);
-	mutex_init(&qd_lock);
 	mutex_init(&console_lock);
 	mutex_init(&control_lock);
 	mutex_init(&stats_lock);