From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 8 Sep 2008 13:52:18 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~45^2~24^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8574193b3663f17dcff1c45f71a72acf0c79c348;p=thirdparty%2Fsquid.git

Merge from trunk
---

8574193b3663f17dcff1c45f71a72acf0c79c348