Merge branch 'master' of ssh://git.postgresql.org/press
authorSzymon Guz <simon@simononsoftware.com>
Tue, 4 Sep 2012 19:44:04 +0000 (21:44 +0200)
committerSzymon Guz <simon@simononsoftware.com>
Tue, 4 Sep 2012 19:44:04 +0000 (21:44 +0200)

Trivial merge