From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 15 May 2008 12:34:22 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~240^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96551d64804bc99a0e091e2d41ad2ceac90bf3a0;p=thirdparty%2Fsquid.git

Merge from trunk
---

96551d64804bc99a0e091e2d41ad2ceac90bf3a0