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

[Peter Robinson]

commit 4cfa3060a7c57c59fffb67d4caed19e47ea1377a
Merge: 7f736b9 f505c25
Author: Peter Robinson 
Date:   Tue May 1 00:41:55 2012 +0100

Merge branch 'master' into f17

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