[sugar-paint/f17: 3/3] fix merge

[Peter Robinson]

commit 626eafbd1fc56848b265cc4ec7a55cf80585224b
Merge: e62595f 9e58cf6
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Mar 10 10:49:19 2012 +0000

    fix merge

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