[firmware-tools/f13/master: 5/5] finish merge

[Matt Domsch]

commit 693b995318e72f5c8289cd779573c8fb0a5aa0b2
Merge: b818f9c 121c96b
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Fri Oct 8 21:13:07 2010 -0500

    finish merge

 .gitignore          |    2 +-
 firmware-tools.spec |   15 +++++++++++++--
 sources             |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 58c67d7,a56d805..7c5e8dc
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- firmware-tools-2.1.9.tar.bz2
 -firmware-tools-2.1.13.tar.bz2
 -/firmware-tools-2.1.14.tar.bz2
++firmware-tools-2.1.14.tar.bz2