libX11: Changes to 'master'

[Jeremy Huddleston]

 modules/im/ximcp/imRmAttr.c |    7 +++++--
 nls/locale.alias.pre        |   19 -------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

New commits:
commit 913603660c17ec59a4d39d3e3b9d60469ee5c060
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Oct 9 02:26:45 2011 -0700

    Fix potential uninitialized variable access in _XimMakeICAttrIDList
    
    Found by clang static analysis
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

commit 566ceaf5a92c721ac7155528e4d0d2e5cbef023f
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Oct 9 02:25:50 2011 -0700

    Remove self-resolving aliases
    
    https://bugs.freedesktop.org/show_bug.cgi?id=30112
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>