From: Micah Cowan <micah@cowan.name>
Date: Thu, 28 Aug 2008 08:21:59 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~338^2~7
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=090f1596ae2eb446c265a62849f59657a9ee9e07

Automated merge.
---

090f1596ae2eb446c265a62849f59657a9ee9e07