[sugar-speak/f14: 2/2] Merge branch 'master' into f14

[Peter Robinson]

commit 384fa4e3b47b3931ff2ee4de5e4bb4628e7f418c
Merge: 51fdb5e d0a0f2e
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Jul 13 10:07:20 2011 +0100

    Merge branch 'master' into f14

 .gitignore       |    1 +
 sources          |    2 +-
 sugar-speak.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---