PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: 27335 Submitted by: Anatoliy Dmytriyev <tolid@plab.ku.dk>