[kdeaccessibility/f18: 8/8] Merge branch 'master' into f18

[Rex Dieter]

commit c87cd4f6cfaea8d212732e89c65bcd1bb8fd98e5
Merge: 333536b f7821c8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 13:16:36 2013 -0600

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

 kdeaccessibility.spec |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)
---