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

[Peter Robinson]

commit df9a435cd416746b69115cc7e514f6ef313c5e1e
Merge: b71fb09 8c75c7f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun May 27 10:38:54 2012 +0100

    Merge branch 'master' into f17

 sugar-toolkit.spec |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)
---