[kdeaccessibility/f16: 7/7] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit b3795b609d1522e9a15c70dfe68401225f5c9cc4
Merge: c26e9af afd8c26
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:28:25 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kdeaccessibility.spec
    	sources

 .gitignore            |    2 -
 kdeaccessibility.spec |  148 ++++++++++---------------------------------------
 sources               |    1 -
 3 files changed, 29 insertions(+), 122 deletions(-)
---