From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 7 Nov 2008 12:13:18 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1255^2~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecbeb536632921fb0794ce95d965e24896d7b4b5;p=thirdparty%2Fsquid.git

Merge from trunk
---

ecbeb536632921fb0794ce95d965e24896d7b4b5