--- plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java.orig	2013-11-05 17:35:28.000000000 +0200
+++ plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java	2013-11-11 11:01:42.396817944 +0200
@@ -24,9 +24,6 @@ import org.python.pydev.runners.SimpleRu
 import org.python.pydev.shared_core.string.StringUtils;
 import org.python.pydev.shared_core.utils.PlatformUtils;
 
-import at.jta.Key;
-import at.jta.Regor;
-
 public class PythonInterpreterProviderFactory extends AbstractInterpreterProviderFactory {
 
     public IInterpreterProvider[] getInterpreterProviders(InterpreterType type) {
@@ -62,46 +59,6 @@ public class PythonInterpreterProviderFa
         } else {
             // On windows we can try to see the installed versions...
             List<String> foundVersions = new ArrayList<String>();
-            try {
-                Regor regor = new Regor();
-
-                // The structure for Python is something as
-                // Software\\Python\\PythonCore\\2.6\\InstallPath
-                for (Key root : new Key[] { Regor.HKEY_LOCAL_MACHINE, Regor.HKEY_CURRENT_USER }) {
-                    Key key = regor.openKey(root, "Software\\Python\\PythonCore", Regor.KEY_READ);
-                    if (key != null) {
-                        try {
-                            @SuppressWarnings("rawtypes")
-                            List l = regor.listKeys(key);
-                            for (Object o : l) {
-                                Key openKey = regor.openKey(key, (String) o + "\\InstallPath", Regor.KEY_READ);
-                                if (openKey != null) {
-                                    try {
-                                        byte buf[] = regor.readValue(openKey, "");
-                                        if (buf != null) {
-                                            String parseValue = Regor.parseValue(buf);
-                                            // Ok, this should be the directory
-                                            // where it's installed, try to find
-                                            // a 'python.exe' there...
-                                            File file = new File(parseValue, "python.exe");
-                                            if (file.isFile()) {
-                                                foundVersions.add(file.toString());
-                                            }
-                                        }
-                                    } finally {
-                                        regor.closeKey(openKey);
-                                    }
-                                }
-                            }
-                        } finally {
-                            regor.closeKey(key);
-                        }
-                    }
-                }
-
-            } catch (Throwable e) {
-                Log.log(e);
-            }
             if (foundVersions.size() > 0) {
                 return AlreadyInstalledInterpreterProvider.create("python",
                         foundVersions.toArray(new String[foundVersions.size()]));
--- plugins/org.python.pydev.debug/src/org/python/pydev/debug/processfactory/PyProcessFactory.java.sav	2014-03-18 19:12:02.000000000 +0200
+++ plugins/org.python.pydev.debug/src/org/python/pydev/debug/processfactory/PyProcessFactory.java	2014-03-20 16:18:48.873316842 +0200
@@ -8,8 +8,6 @@ import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.IProcessFactory;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.RuntimeProcess;
-import org.jvnet.process_factory.AbstractProcess;
-import org.jvnet.process_factory.ProcessFactory;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.debug.ui.DebugPrefsPage;
 
@@ -57,17 +55,6 @@ public class PyProcessFactory implements
 
         @Override
         public void destroy() {
-            if (DebugPrefsPage.getKillSubprocessesWhenTerminatingProcess()) {
-                try {
-                    AbstractProcess p = ProcessFactory.CreateProcess(process);
-                    //I.e.: this is the real change in this wrapper: when killing a process, we'll kill the children 
-                    //processes too, not only the main process (i.e.: so that we don't have zombie processes alive for 
-                    //Django, etc).
-                    p.killRecursively();
-                } catch (Exception e) {
-                    Log.log(e);
-                }
-            }
             try {
                 process.destroy();
             } catch (Exception e) {
--- plugins/org.python.pydev.debug/build.properties.sav	2014-05-20 20:44:15.000000000 +0300
+++ plugins/org.python.pydev.debug/build.properties	2014-05-29 18:40:44.914059002 +0300
@@ -1,5 +1,4 @@
 bin.includes = plugin.xml,\
-               libs/winp-1.19.jar,\
                META-INF/,\
                schema/,\
                icons/,\