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

Trivial merge