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

[Peter Robinson]

commit 61ea3ddd31c1f189a4948f75cc36046a43d2ac4a
Merge: 1a8881d be656ca
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Jul 25 16:02:37 2011 +0100

    Merge branch 'master' into f14

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