From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 21 Nov 2009 05:06:46 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~472^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40236ba7db674b2614fbdccef7806f0c5aeb872f;p=thirdparty%2Fsquid.git

Merge from trunk
---

40236ba7db674b2614fbdccef7806f0c5aeb872f