Merge branch 'master' into cmd-casl
authorj8takagi <j8takagi@nifty.com>
Tue, 9 Feb 2010 12:15:59 +0000 (21:15 +0900)
committerj8takagi <j8takagi@nifty.com>
Tue, 9 Feb 2010 12:15:59 +0000 (21:15 +0900)

Trivial merge