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

[Peter Robinson]

commit 51fdb5e22444d8a9e0d58adf19bd136eddd4bf59
Merge: 98271f4 adcaa6e
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jun 18 10:28:06 2011 +0100

    Merge branch 'master' into f14

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