8ab2176 Backport devel changes to EL-5 branch.

Authored and Committed by thias 16 years ago
    Backport devel changes to EL-5 branch.
    
        
file modified
+29 -14