[orca: 14/14] Merge branch 'f15'

[Tomas Bzatek]

commit 15d85dfec473cf80afe5feeb6a85e6ddaf6ba1d8
Merge: c857377 e1dfcac
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Fri Apr 22 14:14:12 2011 +0200

    Merge branch 'f15'
    
    Conflicts:
    	orca.spec

 .gitignore                        |    5 ++
 no-display.patch                  |   19 ------
 orca-1.0.0-add-stop-switch.patch  |   43 --------------
 orca-2.17.4-add-stop-switch.patch |   43 --------------
 orca-fix-signal-handling.patch    |   20 -------
 orca-not-for-kde.patch            |    8 +++
 orca.spec                         |  111 +++++++++++++++++++++----------------
 sources                           |    2 +-
 use-gsettings.patch               |   15 +++++
 9 files changed, 93 insertions(+), 173 deletions(-)
---