bbfe8f7 sync w/devel branch

Authored and Committed by rdieter 15 years ago
    sync w/devel branch
    
        
file modified
+11 -2
file modified
+13 -13