Half of the patch is redundant with 3ede1723 so slipstream it there. CCMAIL: halla@valdyas.org CCMAIL: dimula73@gmail.com