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

[Peter Robinson]

commit d241875abbe04c2db8533b99e16ccaa978b6368f
Merge: 626eafb ac10801
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Mar 16 13:06:30 2012 +0000

    Merge branch 'master' into f17

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