Merge branch 'master' into immutable_as_real_trait
Dave Rolsky [Fri, 3 Jul 2009 02:20:37 +0000 (21:20 -0500)]

Trivial merge