From: Micah Cowan <micah@cowan.name>
Date: Sat, 5 Sep 2009 20:34:15 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~250
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=0c24c435e7cca5cee1984eb6cf06fca0c37cc7ff

Automated merge.
---

0c24c435e7cca5cee1984eb6cf06fca0c37cc7ff