Merge branch 'master' into check_always check_always
authorShigeru Hanada <[email protected]>
Mon, 4 Jul 2011 00:50:47 +0000 (09:50 +0900)
committerShigeru Hanada <[email protected]>
Mon, 4 Jul 2011 00:50:47 +0000 (09:50 +0900)

Trivial merge