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

[Peter Robinson]

commit 03a048345482eeb90f9545d9852dc1bc386c09bc
Merge: ca062dc 283d18a
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat May 5 12:39:41 2012 +0100

    Merge branch 'master' into f17

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