merge trunk to method-changes branch
Dave Rolsky [Mon, 15 Sep 2008 13:32:49 +0000 (13:32 +0000)]

Trivial merge