From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sat, 22 Mar 2008 01:05:55 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: BASIC_TPROXY4~15^2~5^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=644e2a231aac4df0ea79f9c98852a5de9cf39b6f;p=thirdparty%2Fsquid.git

Merged from trunk
---

644e2a231aac4df0ea79f9c98852a5de9cf39b6f
diff --cc src/DiskIO/DiskThreads/aiops_win32.cc
index ec670231f0,4b9d2b1af5..ec670231f0
mode 100755,100644..100644
--- a/src/DiskIO/DiskThreads/aiops_win32.cc
+++ b/src/DiskIO/DiskThreads/aiops_win32.cc