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

[Peter Robinson]

commit a4942abae3d6a7b44f019f2516f9f00e05b71435
Merge: 66616f1 7968fd4
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Mar 16 03:38:09 2011 +0000

    Merge branch 'master' into f14

 speech-dispatcher.spec |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
---