40b07b Merge branch 'master' into el6

Merged and Committed by Adrian Reber 11 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    
        
file modified
+2 -1
file modified
+17 -2
file modified
+1 -1