Updated to work properly in a clean environment.
Authored by: keess 2005-09-23
Parent: [r1453]
Child: [r1455]
