[speech-dispatcher/f22: 5/5] fix merge

[Peter Robinson]

commit b560a5291dfaf4b40699ba1b0490711eeb081dec
Merge: aec8f89 451dc2f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Mar 24 08:37:44 2015 +0000

    fix merge

 speech-dispatcher.spec | 74 +++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 10 deletions(-)
---