#
#
# patch "charset.cc"
#  from [2b36a7faf39adc8a87f9720c4ea3cb43e9f679ab]
#    to [1cf0ba66a8c3b8a5e660d6b350e148512cebe889]
# 
# patch "charset.hh"
#  from [6acb3d0700a61970e6d7fcd6bca9a728c08cca47]
#    to [d3cb086ac17fdd87735c10d5f1c4d81cadaf36a6]
#
============================================================
--- charset.cc	2b36a7faf39adc8a87f9720c4ea3cb43e9f679ab
+++ charset.cc	1cf0ba66a8c3b8a5e660d6b350e148512cebe889
@@ -364,14 +364,6 @@ void
 }
 
 void
-internalize_cert_name(external const & ext, cert_name & c)
-{
-  utf8 utf;
-  system_to_utf8(ext, utf);
-  internalize_cert_name(utf, c);
-}
-
-void
 internalize_key_name(utf8 const & utf, key_name & key)
 {
   string tmp;
@@ -397,47 +389,6 @@ void
 }
 
 void
-internalize_key_name(external const & ext, key_name & key)
-{
-  utf8 utf;
-  system_to_utf8(ext, utf);
-  internalize_key_name(utf, key);
-}
-
-void
-externalize_key_name(key_name const & key, utf8 & utf)
-{
-  string tmp;
-  typedef boost::tokenizer<char_separator<char> >
-    tokenizer;
-  char_separator<char> sep("", ".@", boost::keep_empty_tokens);
-  tokenizer tokens(key(), sep);
-  bool in_domain = false;
-  for(tokenizer::iterator i = tokens.begin(); i != tokens.end(); ++i)
-    {
-      if (!in_domain || *i == "." || *i == "@")
-        tmp += *i;
-      else
-        {
-          utf8 u;
-          ace_to_utf8(*i, u, key.made_from);
-          tmp += u();
-        }
-      if (*i == "@")
-        in_domain = true;
-    }
-  utf = utf8(tmp, key.made_from);
-}
-
-void
-externalize_key_name(key_name const & key, external & ext)
-{
-  utf8 utf;
-  externalize_key_name(key, utf);
-  utf8_to_system_strict(utf, ext);
-}
-
-void
 internalize_var_domain(utf8 const & utf, var_domain & d)
 {
   string a;
@@ -446,24 +397,10 @@ void
 }
 
 void
-internalize_var_domain(external const & ext, var_domain & d)
-{
-  utf8 utf;
-  system_to_utf8(ext, utf);
-  internalize_var_domain(utf, d);
-}
-
-void
-externalize_var_domain(var_domain const & d, utf8 & utf)
-{
-  ace_to_utf8(d(), utf, d.made_from);
-}
-
-void
 externalize_var_domain(var_domain const & d, external & ext)
 {
   utf8 utf;
-  externalize_var_domain(d, utf);
+  ace_to_utf8(d(), utf, d.made_from);
   utf8_to_system_strict(utf, ext);
 }
 
============================================================
--- charset.hh	6acb3d0700a61970e6d7fcd6bca9a728c08cca47
+++ charset.hh	d3cb086ac17fdd87735c10d5f1c4d81cadaf36a6
@@ -38,16 +38,8 @@ void internalize_cert_name(utf8 const & 
 
 // Specific internal / external conversions for various vocab terms.
 void internalize_cert_name(utf8 const & utf, cert_name & c);
-//void internalize_cert_name(external const & ext, cert_name & c);
-//void externalize_cert_name(cert_name const & c, utf8 & utf);
-//void externalize_cert_name(cert_name const & c, external & ext);
 void internalize_key_name(utf8 const & utf, key_name & key);
-//void internalize_key_name(external const & ext, key_name & key);
-//void externalize_key_name(key_name const & key, utf8 & utf);
-//void externalize_key_name(key_name const & key, external & ext);
 void internalize_var_domain(utf8 const & utf, var_domain & d);
-//void internalize_var_domain(external const & ext, var_domain & d);
-//void externalize_var_domain(var_domain const & d, utf8 & utf);
 void externalize_var_domain(var_domain const & d, external & ext);
 
 #endif