merge trunk

3 files changed, 6 insertions, 2 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index f91d53194ce..fc3370bb380 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * unidata/makefile.w32-in (clean): Remove bidimirror.h and biditype.h.
+
 2011-10-31  David Engster  <deng@randomsample.de>
 
         * grammars/bovine-grammar.el: Avoid using old-style backquotes.
diff --git a/admin/charsets/mapfiles/Uni2JIS b/admin/charsets/mapfiles/Uni2JIS
index 59e3a1e1dfa..b81d10c6ae2 100644
--- a/admin/charsets/mapfiles/Uni2JIS
+++ b/admin/charsets/mapfiles/Uni2JIS
@@ -514,7 +514,7 @@
 045A    S-0790                  # CYRILLIC SMALL LETTER NJE
 045B    S-0791                  # CYRILLIC SMALL LETTER TSHE (Serbocroatian)
 045C    S-0792                  # CYRILLIC SMALL LETTER KJE
-045E    S-0793                  # CYRILLIC SMALL LETTER SHORT U (Byalorussian)
+045E    S-0793                  # CYRILLIC SMALL LETTER SHORT U (Byelorussian)
 045F    S-0794                  # CYRILLIC SMALL LETTER DZHE
 2010    0-0130  1-0130  2-0130  # HYPHEN
 2014    0-0129  1-0129  2-0129  # EM DASH
diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in
index 96a1f5b86fd..0e9b9f0d2bd 100644
--- a/admin/unidata/makefile.w32-in
+++ b/admin/unidata/makefile.w32-in
@@ -52,5 +52,5 @@ charprop-CMD: unidata-gen.elc unidata.txt
 ${DSTDIR}/charprop.el: charprop-$(SHELLTYPE)
 
 clean:
-        - $(DEL) unidata-gen.elc unidata.txt biditype.h bidimirror.h
+        - $(DEL) unidata-gen.elc unidata.txt