[libsmbios/f13/master: 4/4] finish merge

[Matt Domsch]

commit 0e615bdd95be20298a2446528c450d332ac466f7
Merge: dcc2274 b2f0d71
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Fri Oct 8 21:09:56 2010 -0500

    finish merge

 .gitignore     |    3 ++-
 libsmbios.spec |   43 ++++++++++++++++++++++++++++++++-----------
 sources        |    2 +-
 3 files changed, 35 insertions(+), 13 deletions(-)
---
diff --cc .gitignore
index 3939e0c,15fed21..894018a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,2 @@@
- libsmbios-2.2.19.tar.bz2
+ libsmbios-2.2.26.tar.bz2
++