From: Micah Cowan <micah@cowan.name>
Date: Wed, 1 Jul 2009 18:10:42 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~330
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=a9da78c6d8f9e2699107fcde81efeb607dde1cca

Automated merge.
---

a9da78c6d8f9e2699107fcde81efeb607dde1cca