[kdeaccessibility/f17: 7/7] Merge branch 'master' into f17

[Rex Dieter]

commit 361aea2f0b6483524e2b7cf68557edf40cd5182f
Merge: 77a0918 f918548
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 08:02:27 2012 -0500

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

 kdeaccessibility.spec |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)
---