[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 conf.d/30-urw-aliases.conf |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 254232f47eaea0d03d2b1c2405d4ded5fd09142e
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Mar 7 18:16:35 2012 +0900

    Bug 19128 - Handling whitespace in aliases
    
    Add a workaround alias for Dingbats.

diff --git a/conf.d/30-urw-aliases.conf b/conf.d/30-urw-aliases.conf
index 9d59203..359f9fb 100644
--- a/conf.d/30-urw-aliases.conf
+++ b/conf.d/30-urw-aliases.conf
@@ -29,6 +29,11 @@
 	  <family>Zapf Dingbats</family>
 	  <accept><family>Dingbats</family></accept>
 	</alias>
+	<!-- workaround for Bug#19128 -->
+	<alias binding="same">
+	  <family>ZapfDingbats</family>
+	  <accept><family>Dingbats</family></accept>
+	</alias>
 	<match target="pattern">
 	  <test name="family">
 	    <string>Symbol</string>