Merge branch 'master' into postgresql_fdw
authorShigeru Hanada <hanada@metrosystems.co.jp>
Thu, 24 Feb 2011 11:34:30 +0000 (20:34 +0900)
committerShigeru Hanada <hanada@metrosystems.co.jp>
Thu, 24 Feb 2011 11:34:30 +0000 (20:34 +0900)

Trivial merge