Updated the hybrid analysis API to match the base API.
Authored by: bugman 2009-11-25
Parent: [r9954]
Child: [r9956]