From 2a6772128393085ee76da22120a793c998353d69 2008-08-17 10:27:45
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2008-08-17 10:27:45
Subject: [PATCH] Merge with upstream.

---