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

[Peter Robinson]

commit b7cf62219c93d1d53bae39408506d803ad8a6070
Merge: 3d7bc85 9d1b27f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Jun 6 17:24:57 2012 +0100

    Merge branch 'master' into f17

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