Change test to return 255 rather than -1, as per the change in commit
ef8c0ab6d26510bd61a24718c0a763911043aec5
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
If the first useful command of a try block requires
an implicit wait then we can rollback the transaction and restart
it after the wait has completed.  This allows some commands
ie 'drop node' to be inside of a try block.
Bug 230.
log_timestamps is always treated as off on some platforms,
ie AIX.
Bug #231

Regex needs to have extra [braces] around [[:space:]] in start_slon.sh
Merge branch 'master' of ssh://git.postgresql.org/slony1-engine

Conflicts:
	RELEASE
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Include additional headers required by PostgreSQL 9.2 builds
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine