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

[Peter Robinson]

commit b71fb094d5d96dcb9e75b67763944d0daa4a146d
Merge: 61c693d 3c61a43
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat May 5 11:36:59 2012 +0100

    Merge branch 'master' into f17

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