From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 19 Sep 2008 04:20:16 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~45^2~24^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=716aec7b32bba849d67c262627e5143609e8b09b;p=thirdparty%2Fsquid.git

Merge from trunk
---

716aec7b32bba849d67c262627e5143609e8b09b