[dmidecode/f14/master: 4/4] Merge branch 'master' into f14

[Anton Arapov]

commit 3f1c9c79a2e03179bf4c376cd7f5436eae262789
Merge: 44ddf6d 8ac4be5
Author: Anton Arapov <aarapov at redhat.com>
Date:   Wed Jan 19 16:18:29 2011 +0100

    Merge branch 'master' into f14

 .gitignore     |    1 -
 dmidecode.spec |    6 ++++--
 sources        |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
---