From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 18 Sep 2008 13:03:43 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~18^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db2ca822b175d67a7807495e2b1d0137c03f02f;p=thirdparty%2Fsquid.git

Merge from trunk
---

0db2ca822b175d67a7807495e2b1d0137c03f02f