https://sourceforge.net/tracker/index.php?func=detail&aid=1424854&group_id=5776&atid=305776
line numbers were off since the patch was made against 1.8 rather than CVS but it wasn't too hard to apply manually
Authored by: sms00 2006-09-09
Parent: [r3121]
Child: [r3123]
