PR: 7906 Submitted by: Yoshihiko OHTA <yohta@bres.tsukuba.ac.jp>
PR: 6599 Reviewed by: phk Submitted by: Josh Gilliam <josh@quick.net>