Merge branch 'master' of ssh://git.postgresql.org/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 27 Feb 2012 20:39:03 +0000 (15:39 -0500)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 27 Feb 2012 20:39:03 +0000 (15:39 -0500)

Trivial merge