diff -r 38e2e6d5c9b4 -r d4ddf19a1968 config/debug/gdb.in
--- a/config/debug/gdb.in	Mon May 25 20:27:14 2009 +0000
+++ b/config/debug/gdb.in	Sun Sep 13 17:51:33 2009 +0200
@@ -97,54 +97,54 @@
     prompt "gdb version"
     depends on GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER
 
-config GDB_V_6_4
+config GDB_V_snapshot
     bool
-    prompt "6.4 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "snapshot (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+    depends on ! GDB_CROSS_INSIGHT
+
+config GDB_V_6_8
+    bool
+    prompt "6.8"
+
+config GDB_V_6_7_1
+    bool
+    prompt "6.7.1 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+
+config GDB_V_6_7
+    bool
+    prompt "6.7 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+
+config GDB_V_6_6
+    bool
+    prompt "6.6"
 
 config GDB_V_6_5
     bool
     prompt "6.5 (OBSOLETE)"
     depends on OBSOLETE
 
-config GDB_V_6_6
+config GDB_V_6_4
     bool
-    prompt "6.6"
-
-config GDB_V_6_7
-    bool
-    prompt "6.7 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config GDB_V_6_7_1
-    bool
-    prompt "6.7.1 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config GDB_V_6_8
-    bool
-    prompt "6.8"
+    prompt "6.4 (OBSOLETE)"
+    depends on OBSOLETE
 
 # CT_INSERT_VERSION_ABOVE
 # Don't remove above line!
 
-config GDB_V_snapshot
-    bool
-    prompt "snapshot (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-    depends on ! GDB_CROSS_INSIGHT
-
 endchoice
 
 config GDB_VERSION
     string
     default "snapshot" if GDB_V_snapshot
+    default "6.8" if GDB_V_6_8
+    default "6.7.1" if GDB_V_6_7_1
+    default "6.7" if GDB_V_6_7
+    default "6.6" if GDB_V_6_6
+    default "6.5" if GDB_V_6_5
     default "6.4" if GDB_V_6_4
-    default "6.5" if GDB_V_6_5
-    default "6.6" if GDB_V_6_6
-    default "6.7" if GDB_V_6_7
-    default "6.7.1" if GDB_V_6_7_1
-    default "6.8" if GDB_V_6_8
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
 
@@ -156,19 +156,19 @@
     bool
     prompt "ncurses version"
 
+config NCURSES_V_5_7
+    bool
+    prompt "5.7"
+
 config NCURSES_V_5_6
     bool
     prompt "5.6"
 
-config NCURSES_V_5_7
-    bool
-    prompt "5.7"
-
 endchoice
 
 config NCURSES_VERSION
     string
+    default "5.7" if NCURSES_V_5_7
     default "5.6" if NCURSES_V_5_6
-    default "5.7" if NCURSES_V_5_7
 
 endif # GDB_NATIVE --> ncurses