Merge branch 'master' of ssh://git.postgresql.org/press
authorJosh Berkus <josh@agliodbs.com>
Wed, 5 Sep 2012 04:01:35 +0000 (21:01 -0700)
committerJosh Berkus <josh@agliodbs.com>
Wed, 5 Sep 2012 04:01:35 +0000 (21:01 -0700)

Trivial merge