bdc8e35 Merge branch 'f17-branch' of git+ssh://git.fedorahosted.org/git/anaconda into f17-branch

Merged and Committed by bcl 12 years ago
    Merge branch 'f17-branch' of git+ssh://git.fedorahosted.org/git/anaconda into f17-branch
    
        
file modified
+1 -1