Merge branch 'master' into cmd-casl
authorj8takagi <j8takagi@nifty.com>
Mon, 8 Feb 2010 19:42:19 +0000 (04:42 +0900)
committerj8takagi <j8takagi@nifty.com>
Mon, 8 Feb 2010 19:42:19 +0000 (04:42 +0900)

Trivial merge