From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 16 Oct 2008 04:51:12 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1398^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=641e23de3f106bc9a9e4b0171c7ef5e43ee4c0b0;p=thirdparty%2Fsquid.git

Merge from trunk
---

641e23de3f106bc9a9e4b0171c7ef5e43ee4c0b0