b5b432 Merge changes and bump release.

Authored and Committed by thias 15 years ago
    Merge changes and bump release.
    
        
file modified
+13 -1
file modified
+6 -11
file modified
+2 -2
file modified
+139 -80