Merge commit '67a9af6' into cg_merges_20121208

miner.c

@@ -5986,7 +5986,12 @@ static struct work *hash_pop(void)
 	HASH_DEL(staged_work, work);
 	if (work_rollable(work))
 		staged_rollable--;
+
+	/* Signal the getwork scheduler to look for more work */
 	pthread_cond_signal(&gws_cond);
+
+	/* Signal hash_pop again in case there are mutliple hash_pop waiters */
+	pthread_cond_signal(&getq->cond);
 	mutex_unlock(stgd_lock);
 
 	return work;