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

[Peter Robinson]

commit 2620cec97bace32e4d4323d7305a74c30373e016
Merge: 384fa4e 0fa82d3
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Jul 20 20:34:30 2011 +0100

    Merge branch 'master' into f14

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