From: Benno Rice <benno@squid-cache.org>
Date: Fri, 29 Aug 2008 00:32:17 +0000 (+1000)
Subject: Merge from upstream.
X-Git-Tag: SQUID_3_1_0_1~49^2~62^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6530d17d57ecfc918cec4ff89a7db3b2cfa6d162;p=thirdparty%2Fsquid.git

Merge from upstream.
---

6530d17d57ecfc918cec4ff89a7db3b2cfa6d162