Merge branch 'master' into renames-and-deprecations
Dave Rolsky [Fri, 27 Mar 2009 01:28:07 +0000 (20:28 -0500)]

Trivial merge