[dmidecode/f14/master] (4 commits) ...Merge branch 'master' into f14 // resolve conflicts

[Anton Arapov]

Summary of changes:

  8e4de9a... * Fri Oct 15 2010 Anton Arapov <aarapov at redhat.com> - 1:2.1 (*)
  d83d739... * Mon Nov 08 2010 Prarit Bhargava <prarit at redhat.com> - 1:2 (*)
  16b7906... - Update to upstream 2.11 release. (#623047) (*)
  44ddf6d... Merge branch 'master' into f14  // resolve conflicts

(*) This commit already existed in another branch; no separate mail sent