Merged hooks branch @ r1785 into trunk.
Authored by: jplang 2008-09-05
Parent: [r1785]
Child: [r1787]