merged remaining changes from TRANSACTIONS (using cvs update -j TRANSACTIONS)