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

[Jaroslav Škarvada]

commit 37db7bfda6b4b3f7f4f5bda6fb897480132e6bcf
Merge: a820a90 39ad65e
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Dec 14 12:23:26 2011 +0100

    Merge branch 'master' into f15

 espeak.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---