From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 17 Aug 2008 05:56:41 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~78^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0afb98cfe34ea0e9c36dcdedf3800171de2c207a;p=thirdparty%2Fsquid.git

Merge from trunk
---

0afb98cfe34ea0e9c36dcdedf3800171de2c207a