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

[Peter Robinson]

commit 8587bf9c3ea282fa6cb7e26110ce0325b9754ebe
Merge: 100ffc7 8ff72ec
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Sep 29 17:48:28 2010 +0100

    Merge branch 'master' into f14

 .gitignore         |    1 +
 sources            |    2 +-
 sugar-toolkit.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index c7ffad4,dd18f77..cbec677
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,5 +1,3 @@@
 -sugar-toolkit-0.89.1.tar.bz2
 -/sugar-toolkit-0.89.2.tar.bz2
  /sugar-toolkit-0.89.4.tar.bz2
  /sugar-toolkit-0.89.5.tar.bz2
+ /sugar-toolkit-0.90.0.tar.bz2