Merge branch 'master' of ssh://git.postgresql.org/press
authorJosh Berkus <josh@pgexperts.com>
Mon, 29 Aug 2011 00:26:51 +0000 (17:26 -0700)
committerJosh Berkus <josh@pgexperts.com>
Mon, 29 Aug 2011 00:26:51 +0000 (17:26 -0700)

Trivial merge