[sugar-speak/f14/master: 11/11] fix merge

[Peter Robinson]

commit a379c83d16344d678050c4926ee91c7afc33acf6
Merge: 47b67e4 18c08c1
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat May 7 16:09:13 2011 +0100

    fix merge

 .gitignore              |    2 ++
 sources                 |    2 +-
 sugar-speak-checkout.sh |   11 -----------
 sugar-speak.spec        |   34 +++++++++++++++-------------------
 4 files changed, 18 insertions(+), 31 deletions(-)
---