Fixed a merge error in r2830, wrong hook variables where used.
Authored by: edavis10 2009-08-01
Parent: [r2830]
Child: [r2832]