Merge remote-tracking branch 'origin/released'

* origin/released:
  xserver fontconfig libX11 libXext libxcb mesa git update 21 Mar 2014

Conflicts:
	libxcb/src/xcb_auth.c
	libxcb/src/xcb_conn.c
	libxcb/src/xcb_util.c
	libxcb/src/xcb_windefs.h
	mesalib/src/mapi/glapi/glapi.h

2 files changed, 34 insertions, 0 deletions

diff --git a/fontconfig/conf.d/30-metric-aliases.conf b/fontconfig/conf.d/30-metric-aliases.conf
index 49a960247..08c8ba328 100644
--- a/fontconfig/conf.d/30-metric-aliases.conf
+++ b/fontconfig/conf.d/30-metric-aliases.conf
@@ -77,12 +77,15 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  </default>
 	</alias>
 
+<!--
+     Due to Bug#73291, commented out those lines until the broken font are fixed.
 	<alias binding="same">
 	  <family>TeX Gyre Termes</family>
 	  <default>
 	  <family>Times</family>
 	  </default>
 	</alias>
+-->
 
 	<alias binding="same">
 	  <family>Nimbus Mono L</family>
@@ -415,7 +418,10 @@ but in an order preferring similar designs first.  We do this in three steps:
 	<alias binding="same">
 	  <family>Times</family>
 	  <accept>
+<!--
+     Due to Bug#73291, commented out this line until the broken font are fixed.
 	  <family>TeX Gyre Termes</family>
+-->
 	  <family>Nimbus Roman No9 L</family>
 	  </accept>
 	</alias>
diff --git a/fontconfig/fc-lang/README b/fontconfig/fc-lang/README
new file mode 100644
index 000000000..4aef7d116
--- /dev/null
+++ b/fontconfig/fc-lang/README
@@ -0,0 +1,28 @@
+Requirements for adding new orth file:
+
+* we are following up to the locale name, 2 or 3 letter code
+  in ISO 639 and ISO 3166-1 alpha-2 code to determine a
+  filename. if it's not yet available, in advance, you
+  should get it fixed in glibc or so.
+
+* Please add a reference URL (written in English as far as
+  possible) into the orth file that explains the code
+  coverage for the certain language. this would helps to
+  review if it has enough coverage.
+
+* no need to add all of the codepoints for the certain
+  language. good enough if it covers most frequently used
+  codepoints in it.
+
+To update existing orth files:
+
+* Please make sure how the changes affects to the existing
+  fonts and no regressions except it is expected behavior.
+
+* Please add any reference URL in bugzilla or any
+  explanation why it needs to be added/removed and also why
+  current orth file doesn't work.
+
+* Please provide a test case what fonts are supposed to be
+  accepted against the change and what fonts aren't.
+