9f67b4 fix patch skew between this release and whatever walters has upstream

Authored and Committed by ajax 9 years ago
    fix patch skew between this release and whatever walters has upstream