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

[Rex Dieter]

commit 60851cb0af563ead97fff037b1a494b6041c0e5f
Merge: 2cca346 707a2e4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 16 14:00:14 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	kdeaccessibility.spec

 .gitignore                            |    1 +
 kdeaccessibility-4.7.0-moc-fail.patch |   12 ------------
 kdeaccessibility.spec                 |   14 ++++++--------
 sources                               |    2 +-
 4 files changed, 8 insertions(+), 21 deletions(-)
---