188f064 patch from wrong branch

Authored and Committed by caolanm 10 years ago
    patch from wrong branch