Merge commit '1a74bc5' into cg_merges_20130513

Conflicts:
	util.c

util.c

@@ -1888,7 +1888,9 @@ void suspend_stratum(struct pool *pool)
 	applog(LOG_INFO, "Closing socket for stratum pool %d", pool->pool_no);
 	mutex_lock(&pool->stratum_lock);
 	pool->stratum_active = pool->stratum_notify = false;
-	curl_easy_cleanup(pool->stratum_curl);
+	if (pool->stratum_curl) {
+		curl_easy_cleanup(pool->stratum_curl);
+	}
 	pool->stratum_curl = NULL;
 	pool->sock = INVSOCK;
 	mutex_unlock(&pool->stratum_lock);