From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 21 Oct 2008 12:19:40 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1386^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=baaf0e42524aa62b904cd5080c3dd5ec4b81476e;p=thirdparty%2Fsquid.git

Merge from trunk
---

baaf0e42524aa62b904cd5080c3dd5ec4b81476e