Replace old spy and spy2 with new spy (briefly called spy3)
Authored by: efiring 2006-12-10
Parent: [r2914]
Child: [r2916]