Merge branch 'master' of ssh://git.postgresql.org/press
authorGevik Babakhani <gevik@xs4all.nl>
Sat, 8 Sep 2012 20:49:03 +0000 (22:49 +0200)
committerGevik Babakhani <gevik@xs4all.nl>
Sat, 8 Sep 2012 20:49:03 +0000 (22:49 +0200)

Trivial merge