[firmware-addon-dell/el6/master: 7/7] finish merge

[Matt Domsch]

commit a08d193f267e23aaad8d187f25985ed1fdc21338
Merge: fbc8f02 151a8f1
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Tue Oct 5 14:47:29 2010 -0500

    finish merge

 .gitignore               |    3 +-
 firmware-addon-dell.spec |   75 +++++++++++++++++++++++++++-------------------
 sources                  |    2 +-
 3 files changed, 47 insertions(+), 33 deletions(-)
---
diff --cc .gitignore
index 4e111b8,f1f02ae..dbfe941
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,2 @@@
- firmware-addon-dell-2.1.2.tar.gz
+ firmware-addon-dell-2.2.9.tar.bz2
++