Merge branch 'master' of ssh://git.postgresql.org/press
authorAlexey Klyukin <alexk@commandprompt.com>
Wed, 5 Sep 2012 23:26:58 +0000 (02:26 +0300)
committerAlexey Klyukin <alexk@commandprompt.com>
Wed, 5 Sep 2012 23:26:58 +0000 (02:26 +0300)

Trivial merge