[sugar-help/f14: 6/6] fix merge

[Peter Robinson]

commit 26bb4e163be05bf70a49b3bddac800ce7a08bf22
Merge: 7494dd8 3f70a75
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Sep 20 00:59:35 2011 +0100

    fix merge

 .gitignore      |    1 +
 sources         |    2 +-
 sugar-help.spec |   22 +++++++++++-----------
 3 files changed, 13 insertions(+), 12 deletions(-)
---