Merge branch 'master' of git://git.postgresql.org/git/press
authorsas22 <sas@loxodata.fr>
Wed, 31 Aug 2011 17:31:44 +0000 (19:31 +0200)
committersas22 <sas@loxodata.fr>
Wed, 31 Aug 2011 17:31:44 +0000 (19:31 +0200)

Trivial merge