44c8521 Merge branch 'el6' into el5

Merged and Committed by Jan-Frode Myklebust 13 years ago
    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -5
file modified
+10 -1
file modified
+1 -0