From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 1 Aug 2008 02:59:45 +0000 (+1200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~123^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba154c823e0e490f965aa87f31bd4d073c72a4c7;p=thirdparty%2Fsquid.git

Merged from trunk
---

ba154c823e0e490f965aa87f31bd4d073c72a4c7