Merge branch 'master' into per_column_option
authorShigeru Hanada <[email protected]>
Mon, 27 Jun 2011 13:36:39 +0000 (22:36 +0900)
committerShigeru Hanada <[email protected]>
Mon, 27 Jun 2011 13:36:39 +0000 (22:36 +0900)

Trivial merge