Automated merge.

diff --combined src/ChangeLog
index f7ea65c03e4ac36f4237eca2211709f05438f929,dbfd0b662612b7fcc796f43fff8e4857bfc1115e..581b9e1cb7b9aafe8498ffbdd40574cfd63b447a
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,14 -1,10 +1,21 @@@
 +2009-07-04  Micah Cowan  <micah@cowan.name>
 +
 +      * main.c (print_version): Allow localization of the version-info
 +      labels, eschew attempts at alignment (which is complicated when
 +      handling translated strings), and avoid using printf() with
 +      variable-stored format strings that lack conversion
 +      specifications.
 +      (format_and_print_line): For similar reasons, don't calculate
 +      line-continuation tabulation based on the number of bytes in a
 +      string.
 +
+ 2009-07-04  Steven Schubiger  <stsc@member.fsf.org>
+ 
+       * url.c (url_parse): If an URL scheme is invalid, distinguish
+       between an unsupported or missing scheme.
+ 
+       * url.c: Add a "missing scheme" entry to parse_errors.
+ 
  2009-07-03  Micah Cowan  <micah@cowan.name>
  
        * iri.h (iri_dup): Provide macro definition for when IRIs are