From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 25 Sep 2009 04:13:50 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~612^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da94e9a0d165bd61707721dd0188640828055790;p=thirdparty%2Fsquid.git

Merge from trunk
---

da94e9a0d165bd61707721dd0188640828055790