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

Conflicts:
	RELEASE

diff --cc RELEASE
index a3620cfe5cc9035ba9786f50089886f2b7c688cd,833f932d3489936167961dd5401d12bc08ee4b2c..d3028664d0a84921ff2bbf70ad425291a2e3aecb
--- 1/RELEASE
--- 2/RELEASE
+++ b/RELEASE
@@@ -19,16 -24,15 +24,18 @@@
  - Fixed slonik memory corruption when it tries to get the last known
    event_id from a node that doesn't yet have slony installed.
  
 +- Remove rules for building PDFs for the original design docs, in
 +  favor of having the built docs stored in a new "historical
 +  documentation" directory.
 +
 +** 2.1.0 (beta 2)
+ - Bug 219 Default to PostgreSQL 8.4 support if the version of PG is newer than
+           what slony recognizes.
  
  - Fix threading issue in monitor_thread where slon_init can be called
    without the mutex being locked. This function was written to assume
    the mutex lock exists.  
- 
+   
 -** 2.1.0 (beta 2)
 -
  - Bug #204 :: Upgrade from 2.0.x fails under PostgreSQL 8.3, fixing
                issues with failover and non-direct subscribers