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

[Peter Robinson]

commit bf4143986baf0ed3ba3e0f2bf16834d044817dcd
Merge: 93bd48b 0e77257
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jun 5 23:03:40 2012 +0100

    Merge branch 'master' into f17

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