Hand-merge

diff --cc Open-ILS/src/sql/Pg/000.functions.general.sql
index 2dd3e5c,52301a4..daadfdc
--- 1/Open-ILS/src/sql/Pg/000.functions.general.sql
--- 2/Open-ILS/src/sql/Pg/000.functions.general.sql
+++ b/Open-ILS/src/sql/Pg/000.functions.general.sql
@@@ -26,9 -26,7 +26,12 @@@ CREATE OR REPLACE FUNCTION evergreen.xm
         '>', '>');
  $$ LANGUAGE SQL IMMUTABLE;
  
 +CREATE OR REPLACE FUNCTION evergreen.unidecode (TEXT) RETURNS TEXT AS $func$
 +    use Text::Unidecode;
 +    return unidecode(shift());
 +$func$ LANGUAGE PLPERLU IMMUTABLE; 
 +
+ -- Provide a named type for patching functions
+ CREATE TYPE evergreen.patch AS (patch TEXT);
+ 
  COMMIT;