From: Benno Rice <benno@squid-cache.org>
Date: Tue, 23 Sep 2008 23:53:34 +0000 (+1000)
Subject: Merge from upstream.
X-Git-Tag: SQUID_3_1_0_1~49^2~9^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=939968765668ea87665c7f1403865b5302499bbc;p=thirdparty%2Fsquid.git

Merge from upstream.
---

939968765668ea87665c7f1403865b5302499bbc