[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 conf.d/40-nonlatin.conf |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 900675d0b0b40f22ecc0d75e4d5ce16295a3a5e3
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Mar 22 19:57:47 2012 +0900

    Bug 47703 - SimSun default family
    
    40-nonlatin.conf: SimSun should be serif but not sans-serif.
    
    http://www.microsoft.com/typography/fonts/family.aspx?FID=37
    
    Patch from Petr Gajdos

diff --git a/conf.d/40-nonlatin.conf b/conf.d/40-nonlatin.conf
index 1208a6e..c900fd4 100644
--- a/conf.d/40-nonlatin.conf
+++ b/conf.d/40-nonlatin.conf
@@ -89,6 +89,10 @@
 		<family>FreeSerif</family>
 		<default><family>serif</family></default>
 	</alias>
+	<alias>
+		<family>SimSun</family>
+		<default><family>serif</family></default>
+	</alias>
 <!--
   Sans-serif faces
  -->
@@ -153,10 +157,6 @@
 		<default><family>sans-serif</family></default>
 	</alias>
 	<alias>
-		<family>SimSun</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
 		<family>MgOpen Modata</family>
 		<default><family>sans-serif</family></default>
 	</alias>