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

[Peter Robinson]

commit 81a9a0b3ad1d4e26ae38a6ffbec153a9a1c3cb37
Merge: da97cd9 a032316
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Jun 13 01:28:49 2011 +0100

    Merge branch 'master' into f14

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