Merge branch 'master' of ssh://git.postgresql.org/press
authorGevik Babakhani <gevik@xs4all.nl>
Wed, 5 Sep 2012 17:45:04 +0000 (19:45 +0200)
committerGevik Babakhani <gevik@xs4all.nl>
Wed, 5 Sep 2012 17:45:04 +0000 (19:45 +0200)

Trivial merge