競合を解消
authorj8takagi <j8takagi@nifty.com>
Sat, 19 Mar 2011 13:19:02 +0000 (22:19 +0900)
committerj8takagi <j8takagi@nifty.com>
Sat, 19 Mar 2011 13:19:02 +0000 (22:19 +0900)

Trivial merge