From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 23 Sep 2009 07:15:58 +0000 (+1200)
Subject: Merg from trunk
X-Git-Tag: SQUID_3_2_0_1~668^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0263742023e4872c0db3b6cfd13df08c2e4673c1;p=thirdparty%2Fsquid.git

Merg from trunk
---

0263742023e4872c0db3b6cfd13df08c2e4673c1