From: Micah Cowan <micah@cowan.name>
Date: Fri, 28 Sep 2007 23:22:38 +0000 (-0700)
Subject: Merge from mainline
X-Git-Tag: v1.13~536
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=6633b74930870ffb148c46129c738af78082d934

Merge from mainline
---

6633b74930870ffb148c46129c738af78082d934