Bug fix for the bug fix of r10301!
The bug fix actually introduced a bug, and this commit fixes that!
Authored by: bugman 2010-01-25
Parent: [r10301]
Child: [r10303]
