[dfu-util/f13: 5/5] fix merge

[Peter Robinson]

commit d9a0849f30bdd59753aed492202c257cf35ef85d
Merge: 28e7e35 6342e1b
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jun 11 13:05:05 2011 +0100

    fix merge

 .gitignore    |    2 +-
 dfu-util.spec |   52 +++++++++++++++++++---------------------------------
 sources       |    2 +-
 3 files changed, 21 insertions(+), 35 deletions(-)
---
diff --cc .gitignore
index 862f339,e738c87..e2ad88c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- dfu-util-0.1.tar.gz
 -dfu-util-20080922svn4662.tar.gz
 -/dfu-util-0.3.tar.gz
++dfu-util-0.3.tar.gz