[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r46892:981319a0fc81
Date: 2011-08-29 17:38 +0200
http://bitbucket.org/pypy/pypy/changeset/981319a0fc81/

Log:	merge heads

diff --git a/pypy/doc/stackless.rst b/pypy/doc/stackless.rst
--- a/pypy/doc/stackless.rst
+++ b/pypy/doc/stackless.rst
@@ -376,7 +376,7 @@
 Thus the notion of coroutine is *not composable*.  By opposition, the
 primitive notion of continulets is composable: if you build two
 different interfaces on top of it, or have a program that uses twice the
-same interface in two parts, then assuming that both part independently
+same interface in two parts, then assuming that both parts independently
 work, the composition of the two parts still works.
 
 A full proof of that claim would require careful definitions, but let us