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

[Peter Robinson]

commit 2f00a979c4822f4d725747e9d73d6c0176699b17
Merge: 2141df4 f886eff
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Aug 2 13:05:46 2011 +0100

    Merge branch 'master' into f14

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