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

[Peter Robinson]

commit e1be347704768b2732c96f3fb4a0804995f3de44
Merge: 95dd7c8 c1ebc1b
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jul 19 23:13:47 2011 +0100

    Merge branch 'master' into f14

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