Merged in some changes that were added to the linux kernel.
Authored by: mdharm 2000-11-21
Parent: [r708]
Child: [r710]