Automated merge.

diff --combined src/ChangeLog
index 288ec11d5e7f4280407b0743c9e3dc380c25cb27,c707eedfe1d3cacb9ca68a3e9e193b9b11d03986..f8aae8b9230f4d9a2571e79b3dad1a8f48043558
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,16 -1,7 +1,16 @@@
 +2008-06-26  Xavier Saint  <wget@sxav.eu>
 +
 +      * iri.c, iri.h : New functions locale_to_utf8() and
 +      idn_encode() adding basic capabilities of IRI/IDN.
 +
 +      * url.c : Convert URLs from locale to UTF-8 allowing a basic
 +      support of IRI/IDN
 +
 +
  2008-06-19  Xavier Saint  <wget@sxav.eu>
  
        * iri.c, iri.h : New function check_encoding_name() as
-       a priliminary encoding name check.
+       a preliminary encoding name check.
  
        * main.c, iri.c : Make use of check_encoding_name().