ee43a54 Merge changes, bump release.

Authored and Committed by thias 19 years ago
    Merge changes, bump release.
    
        
file modified
+27 -6