[lshw/f13/master: 2/2] Merge branch 'master' into f13

[terjeros]

commit e54b995984141daf0bd291bb090672005ee0076f
Merge: 794edb6 a31e9e3
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sun Nov 21 19:35:37 2010 +0100

    Merge branch 'master' into f13

 .gitignore |    1 +
 lshw.spec  |   52 +++++++++++++++++++++++++++-------------------------
 sources    |    2 +-
 3 files changed, 29 insertions(+), 26 deletions(-)
---