Merge branch 'bug304' of github.com:ssinger/slony1-engine into bug304
authorChristopher Browne <cbbrowne@ca.afilias.info>
Fri, 2 Aug 2013 21:20:41 +0000 (17:20 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Fri, 2 Aug 2013 21:20:41 +0000 (17:20 -0400)

Trivial merge