[orca] Adjust a couple more imports

[Joanmarie Diggs <joanied src gnome org>]

commit 6285f0dcf8702a65c2c6e3af6135721b7ba5777e
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Jun 6 20:10:08 2012 -0400

    Adjust a couple more imports

 src/orca/settings.py              |    3 +--
 src/orca/structural_navigation.py |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 0f378c0..dca6b26 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -681,9 +681,8 @@ chatRoomHistories = False
 # Allow for the customization of key bindings.
 #
 def overrideKeyBindings(script, keyBindings):
-    import orca.settings_manager as settings_manager
+    from . import settings_manager
     _settingsManager = settings_manager.getManager()
-
     return _settingsManager.overrideKeyBindings(script, keyBindings)
 
 # Allow for user customization of pronunciations.
diff --git a/src/orca/structural_navigation.py b/src/orca/structural_navigation.py
index cb92ec1..cb4baba 100644
--- a/src/orca/structural_navigation.py
+++ b/src/orca/structural_navigation.py
@@ -29,14 +29,13 @@ __license__   = "LGPL"
 
 import pyatspi
 
-import orca # Deal with this during final Python 3 conversion
 from . import debug
 from . import input_event
 from . import keybindings
+from . import orca
 from . import orca_state
 from . import settings
 from . import speech
-
 from .orca_i18n import _
 from .orca_i18n import ngettext
 from .orca_i18n import C_