From 462df93fc54384f47a36c114fd318b70ac92e6d8 2008-08-27 01:53:53
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2008-08-27 01:53:53
Subject: [PATCH] Merge with upstream.

---