PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: 25769 Submitted by: Johann Visagie <johann@egenetics.com>