Merge branch 'master' into immutable_as_real_trait
Dave Rolsky [Wed, 1 Jul 2009 17:43:07 +0000 (12:43 -0500)]

Trivial merge