54b4bb1 fix initial merge/conflicts

Merged and Committed by mschwendt 13 years ago
    fix initial merge/conflicts
    
        
file modified
+1 -0
file added
+74
file modified
+1 -0