[firmware-tools/el6/master: 7/7] finish merge

[Matt Domsch]

commit 1c2639f7ec161a2bafeeb8faed1121873d752d52
Merge: c13e7c8 121c96b
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Tue Oct 5 14:44:52 2010 -0500

    finish merge

 .gitignore          |    3 ++-
 firmware-tools.spec |   32 +++++++++++++++++++++++++++-----
 sources             |    2 +-
 3 files changed, 30 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index bdb6bc8,a56d805..3943cff
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,2 @@@
- firmware-tools-2.1.5.tar.gz
 -firmware-tools-2.1.13.tar.bz2
 -/firmware-tools-2.1.14.tar.bz2
++firmware-tools-2.1.14.tar.bz2
++