[espeak/f15: 3/3] Merge branch 'master' into f15

[Jaroslav Škarvada]

commit 31b1ae0e9fc1d85635c64013b31b4bad8ea6be22
Merge: 37db7bf 03c82cc
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Jan 13 14:58:57 2012 +0100

    Merge branch 'master' into f15

 .gitignore  |    2 +-
 espeak.spec |   11 +++++++++--
 sources     |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---