Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 9 Nov 2011 22:34:19 +0000 (17:34 -0500)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 9 Nov 2011 22:34:19 +0000 (17:34 -0500)

Trivial merge