[kdeaccessibility/f13/master: 17/17] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 7be2a4ffc96a1bf84d23db95d3869cee73c1cc7f
Merge: a98a8da 320e802
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 08:43:08 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdeaccessibility.spec
    	sources

 .gitignore            |    2 +-
 kdeaccessibility.spec |   79 ++++++++++++++++++++++++++++++++++++-------------
 sources               |    2 +-
 3 files changed, 60 insertions(+), 23 deletions(-)
---