From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 6 Aug 2008 23:55:29 +0000 (+1200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~106^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f12803139431e4088d5b27890a0750ba1c1024a4;p=thirdparty%2Fsquid.git

Merged from trunk
---

f12803139431e4088d5b27890a0750ba1c1024a4