hopefully these changes all work out for the best
Authored by: hellcatv 2005-08-31
Parent: [r9751]
Child: [r9753]