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

[Peter Robinson]

commit f13508ef9bbbe8dc62dd2f72ecb6b64f5048a617
Merge: c5a95ed 16cf09e
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Mar 9 03:00:34 2011 +0000

    fix merge

 .gitignore       |    2 +-
 sources          |    2 +-
 sugar-pippy.spec |   16 ++++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index 593df58,a46be89..efaae55
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,1 @@@
- Pippy-38.tar.bz2
 -pippy-36.xo
 -Pippy-37.tar.bz2
 -/Pippy-38.tar.bz2
 -/Pippy-40.tar.bz2
++Pippy-40.tar.bz2