Merge branch 'topic/unified-method-generation' into topic/unified-method-generation...
gfx [Mon, 17 Aug 2009 05:41:08 +0000 (14:41 +0900)]

Trivial merge