[pypy-svn] pypy default: merge default

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r42856:e7967ab4df8d
Date: 2011-03-22 18:13 -0600
http://bitbucket.org/pypy/pypy/changeset/e7967ab4df8d/

Log:	merge default

diff --git a/.hgsub b/.hgsub
deleted file mode 100644
--- a/.hgsub
+++ /dev/null
@@ -1,2 +0,0 @@
-greenlet = [svn]http://codespeak.net/svn/greenlet/trunk/c
-lib_pypy/pyrepl = [svn]http://codespeak.net/svn/pyrepl/trunk/pyrepl/pyrepl

diff --git a/.hgsubstate b/.hgsubstate
deleted file mode 100644
--- a/.hgsubstate
+++ /dev/null
@@ -1,2 +0,0 @@
-80037 greenlet
-80409 lib_pypy/pyrepl

diff --git a/pypy/doc/getting-started-python.rst b/pypy/doc/getting-started-python.rst
--- a/pypy/doc/getting-started-python.rst
+++ b/pypy/doc/getting-started-python.rst
@@ -39,13 +39,15 @@
 
      [user at debian-box ~]$ sudo apt-get install \
      gcc make python-dev libffi-dev pkg-config \
-     libz-dev libbz2-dev libncurses-dev libexpat1-dev libssl-dev libgc-dev python-sphinx
+     libz-dev libbz2-dev libncurses-dev libexpat1-dev \
+     libssl-dev libgc-dev python-sphinx python-greenlet
 
    On a Fedora box these are::
 
      [user at fedora-or-rh-box ~]$ sudo yum install \
      gcc make python-devel libffi-devel pkg-config \
-     zlib-devel bzip2-devel ncurses-devel expat-devel openssl-devel gc-devel python-sphinx
+     zlib-devel bzip2-devel ncurses-devel expat-devel \
+     openssl-devel gc-devel python-sphinx python-greenlet
 
    The above command lines are split with continuation characters, giving the necessary dependencies first, then the optional ones.
 
@@ -57,6 +59,7 @@
    * ``libssl-dev`` (for the optional ``_ssl`` module)
    * ``libgc-dev`` (for the Boehm garbage collector: only needed when translating with `--opt=0, 1` or `size`)
    * ``python-sphinx`` (for the optional documentation build)
+   * ``python-greenlet`` (for the optional stackless support in interpreted mode/testing)
 
 2. Translation is somewhat time-consuming (30 min to
    over one hour) and RAM-hungry.  If you have less than 1.5 GB of