6438011 Merge branch 'el6' into f16

Merged and Committed by Jan-Frode Myklebust 12 years ago
    Merge branch 'el6' into f16
    
        
file modified
+21 -1