fd55dff Add also itermediate changes from f14 branch

Authored and Committed by mcrha 13 years ago
    Add also itermediate changes from f14 branch
    
        
file modified
+6 -8