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

[Peter Robinson]

commit 36a2088a9a4f5aa4389d626e8eef27441824bb6c
Merge: 9cda9e4 d733b5f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Oct 15 09:12:59 2010 +0100

    Merge branch 'master' into f14

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