[sugar-toolkit/f17: 2/2] Merge branch 'f17' of ssh://pkgs.fedoraproject.org/sugar-toolkit into f17

[Peter Robinson]

commit 61c693df64c2518012043c8589873cdf3b15369a
Merge: 62c94a9 b2a86a1
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Apr 24 20:40:46 2012 +0100

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/sugar-toolkit into f17

---