[sugar-xoirc/f14/master: 5/5] fix merge

[Peter Robinson]

commit 5749b0f26dc942ec834ff21dc837a0a23e8110d2
Merge: 4f6c97e 05728c8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Mar 9 01:55:58 2011 +0000

    fix merge

 .gitignore              |    1 +
 sources                 |    2 +-
 sugar-xoirc-checkout.sh |   12 ------------
 sugar-xoirc.spec        |   22 +++++++++++++++-------
 4 files changed, 17 insertions(+), 20 deletions(-)
---