[sugar/f15: 2/2] Merge branch 'master' into f15

[Peter Robinson]

commit 64e2a0fcb5e36767019fce3d742ac8b27e70f003
Merge: c04ecd0 cfe5061
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Jul 25 14:07:21 2011 +0100

    Merge branch 'master' into f15

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