From: Xavier Saint <wget@sxav.eu>
Date: Sun, 3 Aug 2008 19:18:49 +0000 (+0200)
Subject: Automated merge.
X-Git-Tag: v1.13~338^2~7^2~6^2~4
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=ac4687846e349b53660d3287b64cbc63d05a0b0f

Automated merge.
---

ac4687846e349b53660d3287b64cbc63d05a0b0f