[usbmuxd/f13/master: 3/3] fix merge

[Peter Robinson]

commit 060d9a4ed5887f80881e8b14a6b764b7710b56e2
Merge: 0296822 6922b3a
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Mar 22 10:38:17 2011 +0000

    fix merge

 .gitignore   |    2 +-
 sources      |    2 +-
 usbmuxd.spec |    8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 5c32291,9984292..3163412
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
- usbmuxd-1.0.6.tar.bz2
 -usbmuxd-1.0.5.tar.bz2
 -/usbmuxd-1.0.6.tar.bz2
 -/usbmuxd-1.0.7.tar.bz2
++usbmuxd-1.0.7.tar.bz2