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

[Peter Robinson]

commit 1a8881d99d45230984060f5fb873df0929366883
Merge: a46709c 51cafa4
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Jun 9 21:12:33 2011 +0100

    Merge branch 'master' into f14

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