Merge branch 'master' into fdw_select_simple
authorShigeru Hanada <hanada@metrosystems.co.jp>
Fri, 12 Nov 2010 07:22:13 +0000 (16:22 +0900)
committerShigeru Hanada <hanada@metrosystems.co.jp>
Fri, 12 Nov 2010 07:22:13 +0000 (16:22 +0900)

Trivial merge