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

[Peter Robinson]

commit 7ea90140dd8258242d91b89763c19eefb7fed486
Merge: 6b1f22b f5c8a84
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Jun 25 19:44:55 2012 +0100

    Merge branch 'master' into f17

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