From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 7 Apr 2008 10:51:08 +0000 (+1200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~233^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2b5ec4af33eb457fa04b9f864d7c93af3ec02a2;p=thirdparty%2Fsquid.git

Merged from trunk
---

f2b5ec4af33eb457fa04b9f864d7c93af3ec02a2