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

[Peter Robinson]

commit 340ad417d1d6732398ec284c105b857d23b7e3b3
Merge: d241875 8a1813b
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Apr 12 13:16:25 2012 +0100

    Merge branch 'master' into f17

 .gitignore       |    1 +
 sources          |    2 +-
 sugar-paint.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---