[firmware-addon-dell/f13/master: 4/4] finish merge

[Matt Domsch]

commit f7cded3e82737d146a8fc32636fd0789658e0c0c
Merge: a7a199e 151a8f1
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Fri Oct 8 21:20:59 2010 -0500

    finish merge

 .gitignore               |    3 +-
 firmware-addon-dell.spec |   47 +++++++++++++++++++++++----------------------
 sources                  |    2 +-
 3 files changed, 27 insertions(+), 25 deletions(-)
---
diff --cc .gitignore
index e6fe4fa,f1f02ae..dbfe941
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,2 @@@
- firmware-addon-dell-2.2.1.tar.gz
+ firmware-addon-dell-2.2.9.tar.bz2
++