[pypy-svn] pypy fast-forward: Merge heads

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: fast-forward
Changeset: r40704:363e84098a9d
Date: 2011-01-14 23:14 +0100
http://bitbucket.org/pypy/pypy/changeset/363e84098a9d/

Log:	Merge heads

diff --git a/lib-python/TODO b/lib-python/TODO
--- a/lib-python/TODO
+++ b/lib-python/TODO
@@ -47,6 +47,9 @@
 
 - implement _io.open() (currently it delegates to _pyio.open)
 
+- module/unicodedata/generate_unicodedb.py should parse LineBreaks.txt
+  see http://svn.python.org/view?view=rev&revision=79494
+
 
 Longer tasks
 ------------