From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 3 Sep 2009 10:44:35 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~668^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc7a4a9eea86eb46405382b5fcc03c51d09593fd;p=thirdparty%2Fsquid.git

Merge from trunk
---

fc7a4a9eea86eb46405382b5fcc03c51d09593fd