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

Trivial merge