Function Declarations were out of sync with their Definitions.
Authored by: sumolx 2011-02-23
Parent: [r3027]
Child: [r3029]
