# DP:   * Lib/locale.py:
# DP:     - Don't map 'utf8', 'utf-8' to 'utf', which is not a known encoding
# DP:       for glibc.

Index: python2.6-2.6.5+20100521/Lib/locale.py
===================================================================
--- python2.6-2.6.5+20100521.orig/Lib/locale.py	2010-05-21 15:37:48.143710174 +0200
+++ python2.6-2.6.5+20100521/Lib/locale.py	2010-05-21 15:37:58.480711378 +0200
@@ -1420,8 +1420,8 @@
     'uk_ua.iso88595':                       'uk_UA.ISO8859-5',
     'uk_ua.koi8u':                          'uk_UA.KOI8-U',
     'uk_ua.microsoftcp1251':                'uk_UA.CP1251',
-    'univ':                                 'en_US.utf',
-    'universal':                            'en_US.utf',
+    'univ':                                 'en_US.UTF-8',
+    'universal':                            'en_US.UTF-8',
     'universal.utf8@ucs4':                  'en_US.UTF-8',
     'ur':                                   'ur_PK.CP1256',
     'ur_pk':                                'ur_PK.CP1256',