Merge branch 'master' of dragon:/home/dav/autotest_mk
authorj8takagi <j8takagi@nifty.com>
Thu, 27 Jan 2011 22:53:00 +0000 (07:53 +0900)
committerj8takagi <j8takagi@nifty.com>
Thu, 27 Jan 2011 22:53:00 +0000 (07:53 +0900)

Trivial merge