[kde-settings/f14/master: 2/2] Merge branch 'master' into f14

[Rex Dieter]

commit 069422f3fbdf2138aa3ada84f807b920cedd00c8
Merge: a8ffd3c 77e9d36
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 3 10:06:09 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore

---