From: Micah Cowan <micah@cowan.name>
Date: Mon, 30 Jun 2008 19:36:28 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~421^2
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=81cee33a6ece8e5b28d719734aefa6555c0da234

Automated merge.
---

81cee33a6ece8e5b28d719734aefa6555c0da234