libX11: Changes to 'master'

[Julien Cristau]

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

New commits:
commit 6dd74d7fb414ca1e99bae5c13e333961f396eb36
Author: Julien Cristau <jcristau at debian.org>
Date:   Fri May 29 11:18:11 2009 +0200

    nls: remove more duplicated aliases
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>

commit e4b0899f516da224010e68bd2d953d5293d94993
Author: parag <parag at rawhideTM.pnq.redhat.com>
Date:   Thu May 28 11:29:35 2009 +0530

    nls: Add pa_PK locale information and make pa_IN as default for pa.
    
    X.Org bug#21954 <http://bugs.freedesktop.org/show_bug.cgi?id=21954>
    
    [jcristau: removed the pa_PK.UTF-8 alias to itself]
    
    Signed-off-by: parag <pnemade at redhat.com>
    Signed-off-by: Julien Cristau <jcristau at debian.org>

commit f0ea1f6d51145592f8617854f9320ec5dbff3299
Author: Julien Cristau <jcristau at debian.org>
Date:   Fri May 29 10:58:20 2009 +0200

    nls: remove broken sd_IN.UTF-8 alias
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>

commit e29e010dabdb17d6498f2ef1786f69b8830c18ca
Author: Julien Cristau <jcristau at debian.org>
Date:   Fri May 29 10:57:43 2009 +0200

    nls: remove duplicated en_US* aliases
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>