diff -up gedit-2.31.5/data/gedit.convert.gsettings-migration gedit-2.31.5/data/gedit.convert
--- gedit-2.31.5/data/gedit.convert.gsettings-migration	2010-07-14 10:51:07.169956001 -0400
+++ gedit-2.31.5/data/gedit.convert	2010-07-14 10:51:07.169956001 -0400
@@ -0,0 +1,47 @@
+[org.gnome.gedit.preferences.editor]
+use-default-font = /apps/gedit-2/preferences/editor/font/use_default_font
+editor-font = /apps/gedit-2/preferences/editor/font/editor_font
+scheme = /apps/gedit-2/preferences/editor/colors/scheme
+create-backup-copy = /apps/gedit-2/preferences/editor/save/create_backup_copy
+auto-save = /apps/gedit-2/preferences/editor/save/auto_save
+auto-save-interval = /apps/gedit-2/preferences/editor/save/auto_save_interval
+undo-actions-limit = /apps/gedit-2/preferences/editor/undo/undo_actions_limit
+max-undo-actions = /apps/gedit-2/preferences/editor/undo/max_undo_actions
+wrap-mode = /apps/gedit-2/preferences/editor/wrap_mode/wrap_mode
+tabs-size = /apps/gedit-2/preferences/editor/tabs/tabs_size
+insert-spaces = /apps/gedit-2/preferences/editor/tabs/insert_spaces
+auto-indent = /apps/gedit-2/preferences/editor/auto_indent/auto_indent
+display-line-numbers = /apps/gedit-2/preferences/editor/line_numbers/display_line_numbers
+highlight-current-line = /apps/gedit-2/preferences/editor/current_line/highlight_current_line
+bracket-matching = /apps/gedit-2/preferences/editor/bracket_matching/bracket_matching
+display-right-margin = /apps/gedit-2/preferences/editor/right_margin/display_right_margin
+right-margin-position = /apps/gedit-2/preferences/editor/right_margin/right_margin_position
+smart-home-end = /apps/gedit-2/preferences/editor/smart_home_end/smart_home_end
+writable-vfs-schemes = /apps/gedit-2/preferences/editor/save/writable_vfs_schemes
+restore-cursor-position = /apps/gedit-2/preferences/editor/cursor_position/restore_cursor_position
+syntax-highlighting = /apps/gedit-2/preferences/syntax_highlighting/enable
+search-highlighting = /apps/gedit-2/preferences/search_highlighting/enable
+
+[org.gnome.gedit-preferences.ui]
+toolbar-visible = /apps/gedit-2/preferences/ui/toolbar/toolbar_visible
+toolbar-buttons-style = /apps/gedit-2/preferences/ui/toolbar/toolbar_buttons_style
+statusbar-visible = /apps/gedit-2/preferences/ui/statusbar/statusbar_visible
+side-pane-visible = /apps/gedit-2/preferences/ui/side_pane/side_pane_visible
+bottom-pane-visible = /apps/gedit-2/preferences/ui/bottom_panel/bottom_panel_visible
+max-recents = /apps/gedit-2/preferences/ui/recents/max_recents
+
+[org.gnome.gedit.preferences.print]
+print-syntax-highlighting =/apps/gedit-2/preferences/print/page/print_syntax_highlighting
+print-header = /apps/gedit-2/preferences/print/page/print_header
+print-wrap-mode = /apps/gedit-2/preferences/print/page/print_wrap_mode
+#print-line-numbers = /apps/gedit-2/preferences/print/page/print_line_numbers
+print-font-body-pango = /apps/gedit-2/preferences/print/fonts/print_font_body_pango
+print-font-header-pango = /apps/gedit-2/preferences/print/fonts/print_font_header_pango
+print-font-numbers-pango = /apps/gedit-2/preferences/print/fonts/print_font_numbers_pango
+
+[org.gnome.gedit.preferences.encodings]
+auto-detected = /apps/gedit-2/preferences/encodings/auto_detected
+shown-in-menu = /apps/gedit-2/preferences/encodings/shown_in_menu
+
+[org.gnome.gedit.plugins]
+active-plugins = /apps/gedit-2/plugins/active-plugins
diff -up gedit-2.31.5/data/Makefile.am.gsettings-migration gedit-2.31.5/data/Makefile.am
--- gedit-2.31.5/data/Makefile.am.gsettings-migration	2010-07-06 06:33:40.000000000 -0400
+++ gedit-2.31.5/data/Makefile.am	2010-07-14 10:52:46.159956002 -0400
@@ -26,6 +26,9 @@ gsettings_SCHEMAS = org.gnome.gedit.gsch
 
 @GSETTINGS_RULES@
 
+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = gedit.convert
+
 EXTRA_DIST = 					\
 	$(desktop_in_files)			\
 	$(service_in_files)			\