6afa963 - pull in the current version of this patch from devel

Authored and Committed by nalin 14 years ago
    - pull in the current version of this patch from devel
    
        
file modified
+108 -43