From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 4 Aug 2008 12:43:30 +0000 (+1200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~106^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4272f4b1d41b007611e6355b70d258ba18c7eca;p=thirdparty%2Fsquid.git

Merged from trunk
---

f4272f4b1d41b007611e6355b70d258ba18c7eca