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

[Peter Robinson]

commit 7f736b958f25a854e7436207c3dfec2fbe934746
Merge: b536c3c 1f4b16f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Apr 24 20:41:43 2012 +0100

    Merge branch 'master' into f17

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