[pypy-svn] pypy jit-str_in_preamble: hg merge default

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-str_in_preamble
Changeset: r42970:c4c903f389fd
Date: 2011-03-26 12:55 +0100
http://bitbucket.org/pypy/pypy/changeset/c4c903f389fd/

Log:	hg merge default

diff --git a/pypy/module/imp/app_imp.py b/pypy/module/imp/app_imp.py
deleted file mode 100644
--- a/pypy/module/imp/app_imp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-def load_dynamic(name, pathname, file=None):
-    """Always raises ah ImportError on pypy"""
-    raise ImportError('Not implemented')