From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 5 Jan 2009 03:33:13 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1255^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8c8f429d62c5a1fe37798b8dae9d42e423ad76a;p=thirdparty%2Fsquid.git

Merge from trunk
---

e8c8f429d62c5a1fe37798b8dae9d42e423ad76a