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

[Peter Robinson]

commit b98fd991da1e768b684415001d1e1007cdab3f8b
Merge: 335e979 35221cc
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jun 2 12:21:35 2012 +0100

    Merge branch 'master' into f17

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