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

[Peter Robinson]

commit b29c0c4cef747ea7847c89520e235a4f29c90ad0
Merge: 2108b9f 21cc210
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Jun 9 20:51:40 2011 +0100

    Merge branch 'master' into f15

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