trippi compatibility updates (updates from dev-2075351 that were not correctly merged)
Authored by: pangloss 2008-10-21
Parent: [r7793]
Child: [r7795]