[espeak/f15: 3/3] Merge remote-tracking branch 'origin/f16' into f15

[Jaroslav Škarvada]

commit 37b89789fcf99095f0568a8cd846447e76f387fa
Merge: 710ae3b 935529a
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Sep 16 17:42:42 2011 +0200

    Merge remote-tracking branch 'origin/f16' into f15
    
    Conflicts:
    	espeak.spec

 .gitignore                                         |    2 +-
 espeak-1.40.02-gcc_no_libstdc++.patch              |   39 ---------------
 espeak-1.43-ftbs_ld_libm.patch                     |    2 +-
 ...patch => espeak-1.45.05-runtime-detection.patch |   50 ++++++++++++--------
 espeak.spec                                        |   20 +++-----
 sources                                            |    2 +-
 6 files changed, 41 insertions(+), 74 deletions(-)
---