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

[Than Ngo]

commit 21d9ba932f36040bbcd8fcf7b30879f2e5e56190
Merge: 534c412 6ebb5af
Author: Than Ngo <than at redhat.com>
Date:   Thu Mar 7 15:58:31 2013 +0100

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

 .gitignore       |    1 +
 kaccessible.spec |   21 ++++++++++++++++++---
 sources          |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 3538659,4d9af79..c4b48fb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kaccessible-4.8.5.tar.xz
 +/kaccessible-4.9.1.tar.xz
 +/kaccessible-4.9.2.tar.xz
 +/kaccessible-4.9.3.tar.xz
 +/kaccessible-4.9.4.tar.xz
 +/kaccessible-4.9.5.tar.xz
+ /kaccessible-4.10.1.tar.xz