From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 6 Oct 2008 10:08:10 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~45^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d22f29d9058701c9dc005081ff6339d9d30212c;p=thirdparty%2Fsquid.git

Merge from trunk
---

1d22f29d9058701c9dc005081ff6339d9d30212c