From: Benno Rice <benno@squid-cache.org>
Date: Thu, 18 Sep 2008 00:31:34 +0000 (+1000)
Subject: Merge from upstream.
X-Git-Tag: SQUID_3_1_0_1~49^2~9^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a3d97ee96f71628399de87f3aefcb3f8c7707b6;p=thirdparty%2Fsquid.git

Merge from upstream.
---

0a3d97ee96f71628399de87f3aefcb3f8c7707b6