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

[Peter Robinson]

commit ca062dcaa41aa218747b802db85a07b6837c0522
Merge: 65fe759 481501c
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Apr 24 20:41:20 2012 +0100

    Merge branch 'master' into f17

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