From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 22 Dec 2008 11:02:30 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1255^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e972cef24b3b7e6d41333229d10818b233ab02ab;p=thirdparty%2Fsquid.git

Merge from trunk
---

e972cef24b3b7e6d41333229d10818b233ab02ab