8532512 Merge branch 'f15'

Merged and Committed by tbzatek 13 years ago
    Merge branch 'f15'
    
    Conflicts:
    	.gitignore
    	gnome-bluetooth.spec
    	sources
    
        
file modified
+2 -4
file modified
+13 -1
file modified
+1 -1