[kdeaccessibility/f14/master: 4/4] Merge branch 'master' into f14

[Rex Dieter]

commit 906851fbb6dd6e9aeaa288b6818ce5e757634049
Merge: ab556db c1eece5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 13:43:28 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	kdeaccessibility.spec
    	sources

 .gitignore            |    2 +-
 kdeaccessibility.spec |    5 ++++-
 sources               |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---