From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 23 Sep 2008 00:02:34 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~45^2~24^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcee3d2d22c3e2794aa9f37e20b6a7cd7971bf84;p=thirdparty%2Fsquid.git

Merge from trunk
---

bcee3d2d22c3e2794aa9f37e20b6a7cd7971bf84