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

[Peter Robinson]

commit 2141df462c1f5e9978589914820e8e60218ac32d
Merge: e1be347 14b6bf2
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Jul 28 14:06:03 2011 +0100

    Merge branch 'master' into f14

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