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

[Peter Robinson]

commit c314b1d3af4b76082b1fdeb07c90652be7521f54
Merge: de2761d 28f4e83
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Oct 23 12:23:41 2010 +0100

    Merge branch 'master' into f14

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