From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Mon, 3 Aug 2009 09:35:08 +0000 (+0200)
Subject: merged from trunk
X-Git-Tag: SQUID_3_2_0_1~819^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f2383e98f4b22a225237948565f4decb54a8c34;p=thirdparty%2Fsquid.git

merged from trunk
---

9f2383e98f4b22a225237948565f4decb54a8c34