Index: orca/ChangeLog
===================================================================
RCS file: /cvs/gnome/orca/ChangeLog,v
retrieving revision 1.463
diff -p -u -r1.463 ChangeLog
--- orca/ChangeLog	23 May 2006 22:43:42 -0000	1.463
+++ orca/ChangeLog	24 May 2006 00:40:54 -0000
@@ -1,5 +1,15 @@
 2006-05-23  Willie Walker <william.walker@sun.com>
 
+	* src/orca/atspi.py: pass "orbit-io-thread" to initialize the ORB
+	in threaded mode.  This should hopefully help address bug 319652:
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=319652
+
+	See also:
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=342614 
+	http://mail.gnome.org/archives/orbit-list/2005-December/msg00001.html
+
 	* src/orca/speech.py: add GET support to HTTP server as a means
 	to check Orca version number.
 
Index: orca/src/orca/atspi.py
===================================================================
RCS file: /cvs/gnome/orca/src/orca/atspi.py,v
retrieving revision 1.27
diff -p -u -r1.27 atspi.py
--- orca/src/orca/atspi.py	19 May 2006 15:10:55 -0000	1.27
+++ orca/src/orca/atspi.py	24 May 2006 00:40:54 -0000
@@ -25,7 +25,18 @@ import bonobo
 import ORBit
 
 ORBit.load_typelib("Accessibility")
-ORBit.CORBA.ORB_init()
+
+# We will pass "orbit-io-thread" to initialize the ORB in threaded mode.
+# This should hopefully help address bug 319652:
+#
+#   http://bugzilla.gnome.org/show_bug.cgi?id=319652
+#
+# See also:
+#
+#   http://bugzilla.gnome.org/show_bug.cgi?id=342614
+#   http://mail.gnome.org/archives/orbit-list/2005-December/msg00001.html
+#
+ORBit.CORBA.ORB_init(orb_id="orbit-io-thread")
 
 import Accessibility
 import Accessibility__POA
