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