Merge 'trunk' into 'versioned_enhancements'

Merge 'trunk' into 'versioned_enhancements'

r6854@luke-mbp (orig r4110):  ash | 2008-02-28 19:33:59 +0000
Todo tests for txn_rollback and scope_guard
r6856@luke-mbp (orig r4113):  ash | 2008-03-01 12:17:54 +0000
Fix versioning test so it works with SQLT 0.09.
r6857@luke-mbp (orig r4114):  ash | 2008-03-04 12:06:34 +0000
is_deferrable patch from Debolaz
r6858@luke-mbp (orig r4119):  teejay | 2008-03-04 19:29:45 +0000
Applied fixes to replication connect_info method
r6859@luke-mbp (orig r4120):  teejay | 2008-03-04 19:31:32 +0000
Applied fixes to replication connect_info method
r6860@luke-mbp (orig r4121):  teejay | 2008-03-04 20:18:45 +0000
works but shouldn't
r6861@luke-mbp (orig r4122):  teejay | 2008-03-04 20:41:32 +0000
roughly DTRT - please to be making less awful