[pypy-commit] pypy default: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r47220:9d498078c5a1
Date: 2011-09-12 13:20 +0200
http://bitbucket.org/pypy/pypy/changeset/9d498078c5a1/

Log:	merge

diff --git a/pypy/rlib/rzlib.py b/pypy/rlib/rzlib.py
--- a/pypy/rlib/rzlib.py
+++ b/pypy/rlib/rzlib.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import sys
 
 from pypy.rlib.rstring import StringBuilder