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

[Peter Robinson]

commit 6b1f22bd1f9ce25cc9873371d60ae0059d4013c6
Merge: b46c48c 4d1feaa
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jun 2 12:13:55 2012 +0100

    Merge branch 'master' into f17

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