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

[Peter Robinson]

commit 3d7bc85a387eb7a05d64d41bf528f00056deb174
Merge: b98fd99 6215c9b
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jun 5 23:04:06 2012 +0100

    Merge branch 'master' into f17

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