49a8455 merged with master

Merged and Committed by gnat 13 years ago
    merged with master
    
        
file modified
+4 -0
file modified
+22 -9
file modified
+1 -1