[sugar-moon/f14: 7/7] fix merge

[Peter Robinson]

commit f0c34a24182c529b3dc2642584f3331bcca8d644
Merge: a1bc5d8 a081db1
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Jun 20 19:29:50 2011 +0100

    fix merge

 .gitignore      |    1 +
 sources         |    2 +-
 sugar-moon.spec |   25 +++++++++++++------------
 3 files changed, 15 insertions(+), 13 deletions(-)
---