[speech-dispatcher/f13/master: 12/12] fix merge

[Peter Robinson]

commit cde03bd007773f88dca0cc718cad3e14f059dd06
Merge: b8b9279 957d3f0
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Mar 15 09:18:28 2011 +0000

    fix merge

 sources                             |    2 +-
 speech-dispatcher-gcc44-0.6.7.patch |   22 ----
 speech-dispatcher.spec              |  204 ++++++++++++++---------------------
 speechd.patch                       |   24 ----
 4 files changed, 80 insertions(+), 172 deletions(-)
---