Merge branch 'master' of ssh://git.postgresql.org/press
authorJosh Berkus <josh@agliodbs.com>
Sun, 9 Sep 2012 20:36:54 +0000 (13:36 -0700)
committerJosh Berkus <josh@agliodbs.com>
Sun, 9 Sep 2012 20:36:54 +0000 (13:36 -0700)

Trivial merge