Merge branch
authorj8takagi <j8takagi@nifty.com>
Wed, 30 Jan 2013 23:16:24 +0000 (08:16 +0900)
committerj8takagi <j8takagi@nifty.com>
Wed, 30 Jan 2013 23:16:24 +0000 (08:16 +0900)

Trivial merge