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

[Peter Robinson]

commit c04ecd035e3dfb62b4f795067e86d034f7d597b8
Merge: b29c0c4 aec6104
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Jul 8 11:38:32 2011 +0100

    Merge branch 'master' into f15

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