[speech-dispatcher/f14/master: 4/4] Merge branch 'master' into f14

[Peter Robinson]

commit 66616f1b1f069b8ef5fd11a3fac5c9cb895e435c
Merge: e12b227 957d3f0
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Mar 15 08:22:38 2011 +0000

    Merge branch 'master' into f14

 speech-dispatcher.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---