From: Benno Rice <benno@squid-cache.org>
Date: Fri, 29 Aug 2008 04:40:50 +0000 (+1000)
Subject: Merge from upstream.
X-Git-Tag: SQUID_3_1_0_1~49^2~9^2~10^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3015774882af19789a65c7b773c9b26bf7bd253d;p=thirdparty%2Fsquid.git

Merge from upstream.
---

3015774882af19789a65c7b773c9b26bf7bd253d