3d8356d - Update to latest trunk

Authored and Committed by hadess 15 years ago
    - Update to latest trunk
    - Fix license info to match that of upstream
    
        
file modified
+1 -1
file modified
+7 -3
file modified
+1 -1