libX11: Changes to 'master'

[Alan Coopersmith]

 nls/compose.dir.pre  |    2 +-
 nls/locale.alias.pre |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1e43c262d13cab2b759665f9f13bdedbc7afbfd4
Author: Benno Schulenberg <bensberg at justemail.net>
Date:   Thu Sep 19 13:20:05 2013 +0200

    nls: Fix transposed locale identifier for Khmer.
    
    Signed-off-by: Benno Schulenberg <bensberg at justemail.net>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>