From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 15 Sep 2008 14:40:39 +0000 (+1200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_1_0_1~45^2~24^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b227ee9479215997b8382f9fec6e3d1ce2afa024;p=thirdparty%2Fsquid.git

Merged from trunk
---

b227ee9479215997b8382f9fec6e3d1ce2afa024