=== modified file 'ubiquity/i18n.py'
--- ubiquity/i18n.py	2011-03-28 09:35:55 +0000
+++ ubiquity/i18n.py	2011-04-15 17:01:01 +0000
@@ -253,6 +253,11 @@
             cache = Cache()
 
     languagelist = gzip.open('/usr/lib/ubiquity/localechooser/languagelist.data.gz')
+
+    if os.path.exists("/usr/share/oem-languages/languagelist.data.gz"):
+        languagelist = gzip.open('/usr/share/oem-languages/languagelist.data.gz')
+    else:
+        languagelist = gzip.open('/usr/lib/ubiquity/localechooser/languagelist.data.gz')
     language_display_map = {}
     i = 0
     for line in languagelist:

=== modified file 'ubiquity/plugins/ubi-language.py'
--- ubiquity/plugins/ubi-language.py	2011-03-28 12:08:05 +0000
+++ ubiquity/plugins/ubi-language.py	2011-04-16 15:24:52 +0000
@@ -230,6 +230,16 @@
 
     def set_language(self, language):
         # Support both iconview and treeview
+
+        # optionally set default selected language as follows:
+        # let this file exist:"/usr/share/oem-languages/default-gtk-selected-language"
+        # put in that file the language name, translated, exactly as it appears in 
+        # the languagelist.data.gz file
+        if os.path.exists("/usr/share/oem-languages/default-gtk-selected-language"):
+            lang_default = open("/usr/share/oem-languages/default-gtk-selected-language",
+                'r').read()
+            language = lang_default.strip()
+
         if self.only:
             model = self.iconview.get_model()
             iterator = model.iter_children(None)