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

[Peter Robinson]

commit 93bd48b6b9e7c8f5af52c9f77892aad6e5e43951
Merge: df9a435 7e59e87
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jun 2 12:21:41 2012 +0100

    Merge branch 'master' into f17

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