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

Merged from trunk
---

fb47471bf9d6fe9fbc7b6e72e52f364592ac92c3