f1c743c Merge remote-tracking branch 'origin/f18'

Merged and Committed by jistone 11 years ago
    Merge remote-tracking branch 'origin/f18'
    
    Catches rawhide up to the final 2.1 release, to preserve the upgrade path
    if nothing else.  (We'll start on 2.2 snapshots soon though.)
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+5 -2