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

Merge from trunk
---

ff2fd94bc9b821c8dcc019eda58da2d0b76d1a6a