xserver: Branch 'master'

[Keith Packard]

 dix/dixfonts.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea15f8b4c90ebef21d4031bf7f412ef9241d5438
Author: Jasper St. Pierre <jstpierre at mecheye.net>
Date:   Mon Apr 21 16:30:49 2014 -0400

    dixfonts: Turn a missing directory ErrorF into a DebugF
    
    On systems without these directories, we don't need to be complaining
    loudly.
    
    Reviewed-by: Kristian Hoegsberg <krh at bitplanet.net>
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 83d2539..1c6442c 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1658,7 +1658,7 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist)
                     err = (*fpe_functions[fpe->type].init_fpe) (fpe);
                 if (err != Successful) {
                     if (persist) {
-                        ErrorF
+                        DebugF
                             ("[dix] Could not init font path element %s, removing from list!\n",
                              fpe->name);
                     }