[sugar-log/f14/master: 4/4] Fix merge issues

[Peter Robinson]

commit 2b9737855fa5d25e52348379e77ccf3c29de53dd
Merge: 7a80fea 5d1dcb7
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Oct 4 17:22:49 2010 +0100

    Fix merge issues

 .gitignore     |    1 +
 sources        |    2 +-
 sugar-log.spec |   10 ++++++----
 3 files changed, 8 insertions(+), 5 deletions(-)
---