PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: 17597 Submitted by: Igor Vinokurov <igor@zynaps.ru>