Merge 'trunk' into 'cdbicompat_integration'
Ash Berlin [Thu, 28 Feb 2008 17:33:59 +0000 (09:33 -0800)]
r54651@windhund (orig r4110):  ash | 2008-02-28 11:33:59 -0800
Todo tests for txn_rollback and scope_guard


Trivial merge