4a277bd Post-merge cleanup.

Merged and Committed by corsepiu 12 years ago
    Post-merge cleanup.
    
        
file modified
+8 -8