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

[Peter Robinson]

commit bfe6ef90339aa24dc1d4d5eb9b85d093e8677193
Merge: c949771 3157259
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Sep 20 09:24:48 2011 +0100

    fix merge

 .gitignore                 |    3 +++
 sources                    |    2 +-
 sugar-distance-checkout.sh |   11 -----------
 sugar-distance.spec        |   34 +++++++++++++++++++---------------
 4 files changed, 23 insertions(+), 27 deletions(-)
---