From e69f15af3c05c830f337c3ffd085c84dfd7359aa 2008-07-12 19:19:42
From: Gael Varoquaux <gael.varoquaux@normalesup.org>
Date: 2008-07-12 19:19:42
Subject: [PATCH] Merge with my old branch.

---