[kaccessible/f17: 9/9] Merge branch 'master' into f17

[Rex Dieter]

commit b0c31cb8b828a22b4c5a8654fdfc947c57cc7498
Merge: 24eee61 3b6d3d5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 7 12:06:20 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kaccessible.spec
    	sources

 .gitignore       |    3 +--
 kaccessible.spec |   25 ++++++++++++++++++++-----
 sources          |    2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)
---