Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	localedata/ChangeLog

diff --cc localedata/ChangeLog
index f5a3d96a51fc7ff0da2e43bab5b041fb5dfd0dad,a4f8a13dde4fd965474a5662b20be6703094bc70..c9dad8df253c540955dafc915fc37914910ae13f
--- 1/localedata/ChangeLog
--- 2/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@@ -1,10 -1,8 +1,15 @@@
 +2011-05-09  Ulrich Drepper  <drepper@gmail.com>
 +
 +      [BZ #12738]
 +      * locales/os_RU: New file.
 +      Contributed by Soslan Khubulov <soslanx@gmail.com>.
 +      * SUPPORTED: Add entry for os_RU.
 +
+ 2010-12-02  Andreas Schwab  <schwab@redhat.com>
+ 
+       * SUPPORTED: Remove .UTF-8 suffix from az_AZ, as_IN, tt_RU locale
+       names.
+ 
  2010-05-17  Andreas Schwab  <schwab@redhat.com>
  
        * locales/es_CR (LC_ADDRESS): Fix character names in lang_ab.

diff --cc localedata/SUPPORTED
Simple merge