From: Benno Rice <benno@squid-cache.org>
Date: Mon, 22 Sep 2008 00:41:38 +0000 (+1000)
Subject: Merge from upstream.
X-Git-Tag: SQUID_3_1_0_1~49^2~9^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ebc8f49411ff862ce6347b13d71156ae23af694;p=thirdparty%2Fsquid.git

Merge from upstream.
---

7ebc8f49411ff862ce6347b13d71156ae23af694