These didn't get committed with the others for some reason.
Authored by: stormreaver 2007-06-18
Parent: [r22]
Child: [r24]
