Merge commit '21a36f4' into cg_merges_20130513

Conflicts:
	miner.c

miner.c

@@ -6166,6 +6166,9 @@ static bool cnx_needed(struct pool *pool)
 	if (pool_strategy == POOL_FAILOVER && pool->prio < cp_prio())
 		return true;
 
+	if (pool_unworkable(cp))
+		return true;
+
 	return false;
 }