merge trunk to metaclass-traits branch attic/metaclass-traits
Dave Rolsky [Tue, 29 Jul 2008 19:54:44 +0000 (19:54 +0000)]

Trivial merge