SVN-Revision: 30652
SVN-Revision: 30495
Based on a patch by Layne Edwards <ledwards@astrumtech.net> SVN-Revision: 27997