From 0692720fa8700e23b6e49b8498e24a33f33cbd3e 2008-09-10 04:19:08
From: Gael Varoquaux <gael.varoquaux@normalesup.org>
Date: 2008-09-10 04:19:08
Subject: [PATCH] Merge with upstream.

---