Updated to work properly in a clean environment.
Authored by: keess 2005-09-22
Parent: [r1449]
Child: [r1451]
