[kdeaccessibility/f14/master: 10/10] Merge remote-tracking branch 'origin/master' into f14

[Jaroslav Reznik]

commit 05736ad85d56f16e3bf8a13906df34373c8d59b0
Merge: 6098b56 f971fce
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Tue Mar 15 18:53:06 2011 +0100

    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	.gitignore
    	kdeaccessibility.spec
    	sources

 .gitignore            |    2 +-
 kdeaccessibility.spec |   39 +++++++++++++++++++++++++++++----------
 sources               |    2 +-
 3 files changed, 31 insertions(+), 12 deletions(-)
---