Merge branch 'master' of ssh://git.postgresql.org/press
authorSzymon Guz <simon@simononsoftware.com>
Sat, 8 Sep 2012 20:33:05 +0000 (22:33 +0200)
committerSzymon Guz <simon@simononsoftware.com>
Sat, 8 Sep 2012 20:33:05 +0000 (22:33 +0200)

Trivial merge