From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 12 Oct 2008 12:29:37 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1386^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34188f7bd617580b3657d848932892a709c5cdff;p=thirdparty%2Fsquid.git

Merge from trunk
---

34188f7bd617580b3657d848932892a709c5cdff