From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 13 Sep 2008 00:25:06 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~18^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36433fcc4d0221a000e9849b5d00684ab87dfb0d;p=thirdparty%2Fsquid.git

Merge from trunk
---

36433fcc4d0221a000e9849b5d00684ab87dfb0d