91bf46c merge changes from devel branch

Authored and Committed by Matt Domsch 15 years ago
    merge changes from devel branch
    
        
file added
+59
file modified
+16 -2