py-cvs merge, idle_dir loading changed
diff --git a/Lib/idlelib/idle.py b/Lib/idlelib/idle.py
index 71fdce5..f42327c 100644
--- a/Lib/idlelib/idle.py
+++ b/Lib/idlelib/idle.py
@@ -4,7 +4,7 @@
 import sys
 import IdleConf
 
-idle_dir = os.path.split(sys.argv[0])[0]
+idle_dir = os.path.dirname(IdleConf.__file__)
 IdleConf.load(idle_dir)
 
 # defer importing Pyshell until IdleConf is loaded