(on vendor branch since this change already exists in Jouni's cvs). Approved by: re (scottl)
Approved by: re (dwhite)