[pypy-svn] pypy default: merge heads

[berdario]

Author: Dario Bertini <berdario at gmail.com>
Branch: 
Changeset: r43600:840d77bf3659
Date: 2011-04-25 17:07 +0200
http://bitbucket.org/pypy/pypy/changeset/840d77bf3659/

Log:	merge heads

diff --git a/lib_pypy/greenlet.py b/lib_pypy/greenlet.py
new file mode 100644
--- /dev/null
+++ b/lib_pypy/greenlet.py
@@ -0,0 +1,1 @@
+from _stackless import greenlet