c3925e9 Merge remote branch 'origin/master' into f13

Merged and Committed by Adam Tkac 13 years ago
    Merge remote branch 'origin/master' into f13
    
    Conflicts:
    	.gitignore
    
    Signed-off-by: Adam Tkac <atkac@redhat.com>
    
        
file modified
+3 -1
file modified
+4 -1
file modified
+1 -1