Merge branch 'master' of ssh://git.postgresql.org/press
authorStéphane Schildknecht <sas@postgresql.fr>
Wed, 5 Sep 2012 17:38:36 +0000 (19:38 +0200)
committerStéphane Schildknecht <sas@postgresql.fr>
Wed, 5 Sep 2012 17:38:36 +0000 (19:38 +0200)

Trivial merge