bf128a2 Re-import of 1.1.6

Authored and Committed by imcleod 9 years ago
    Re-import of 1.1.6
    
    Something odd happened on the rawhide branch during my original build
    attempt.  Trying again.
    
        
file modified
+1 -0
file modified
+1 -1