Merge branch 'master' into cmd-casl
authorj8takagi <j8takagi@nifty.com>
Wed, 10 Feb 2010 14:33:04 +0000 (23:33 +0900)
committerj8takagi <j8takagi@nifty.com>
Wed, 10 Feb 2010 14:33:04 +0000 (23:33 +0900)

Trivial merge