From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 12 Jan 2010 06:35:50 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~468^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a57c46ee2d9347441113224def8cac04d5c0e31;p=thirdparty%2Fsquid.git

Merge from trunk
---

9a57c46ee2d9347441113224def8cac04d5c0e31