Merge method_generation_cleanup branch
Yuval Kogman [Sat, 17 Jan 2009 22:59:55 +0000 (22:59 +0000)]

Trivial merge