Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 8 Feb 2012 23:05:10 +0000 (18:05 -0500)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 8 Feb 2012 23:05:10 +0000 (18:05 -0500)

Trivial merge