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

Mon Nov 28 08:45:52 UTC 2011

commit a820a9099408371a80a663f18c3774f2b5a65ef6
Merge: 03fd300 db15602
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Nov 28 09:45:35 2011 +0100

    Merge remote-tracking branch 'origin/f16' into f15

 .gitignore                             |    2 +-
 espeak-1.45.05-runtime-detection.patch |  250 --------------------------------
 espeak.spec                            |   10 +-
 sources                                |    2 +-
 4 files changed, 8 insertions(+), 256 deletions(-)
---