Merge branch 'master' of git://git.postgresql.org/git/slony1-engine

Conflicts:
	RELEASE
	doc/adminguide/ddlchanges.sgml
Merge branch 'master' of github.com:cbbrowne/slony1-engine