Merged updates since last release ready for copying back into HEAD
Authored by: wackston2 2004-12-18
Parent: [r2528]
Child: [r2530]