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

[Anton Arapov]

commit 44ddf6dfd4c475d504f350f341fbf2363f458ddb
Merge: c9d4cb2 16b7906
Author: Anton Arapov <aarapov at redhat.com>
Date:   Wed Jan 19 15:40:51 2011 +0100

    Merge branch 'master' into f14  // resolve conflicts
    
    Conflicts:
    	dmidecode.spec

 .gitignore                                         |    1 +
 dmidecode-add-hewlett-packard-to-dmioem.patch      |   11 --
 dmidecode-add-socket-lga1366.patch                 |   16 ---
 dmidecode-makefile-fix.patch                       |   12 --
 dmidecode-recognize-more-memory.patch              |   11 --
 dmidecode-smbios-2.6.1-updates.patch               |  120 --------------------
 dmidecode-warn-on-unsupported-smbios-version.patch |   25 ----
 dmidecode.spec                                     |   39 +++----
 sources                                            |    2 +-
 9 files changed, 19 insertions(+), 218 deletions(-)
---