Merge commit 'svn/method_generation_cleanup'
Yuval Kogman [Sun, 18 Jan 2009 00:24:38 +0000 (00:24 +0000)]

Trivial merge