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

[Peter Robinson]

commit ab0fc19571ed15e71a963a535cf427f8b92609ea
Merge: ba8ac8b c2a785c
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Sep 7 23:40:16 2011 +0100

    Merge branch 'master' into f16

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