Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Tue, 29 Nov 2011 17:02:59 +0000 (12:02 -0500)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Tue, 29 Nov 2011 17:02:59 +0000 (12:02 -0500)

Trivial merge