From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 10 May 2008 02:58:37 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~233^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebfcda6a35ec42415b14a2b42f068a22a368fe4c;p=thirdparty%2Fsquid.git

Merge from trunk
---

ebfcda6a35ec42415b14a2b42f068a22a368fe4c