From: Micah Cowan <micah@cowan.name>
Date: Tue, 22 Sep 2009 17:24:53 +0000 (-0700)
Subject: Merge with backout.
X-Git-Tag: v1.13~227
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=a6cba129b191db679ef700bc3fbf3bd1eda25862

Merge with backout.
---

a6cba129b191db679ef700bc3fbf3bd1eda25862