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

[Peter Robinson]

commit 1d3955a28e1ac06a8b0e208042f59a854e721fec
Merge: 36a2088 443f708
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Feb 3 15:14:39 2011 +0000

    Merge branch 'master' into f14

 sugar-toolkit.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---