[bios_extract/el4/master: 8/8] Merge branch 'master' into el4/master

[Peter Lemenkov]

commit 6e70c9b28e81964a4941f8c360a311e17eb88de3
Merge: 22dc13a c0fbfec
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Jan 22 10:01:56 2011 +0300

    Merge branch 'master' into el4/master
    
    Conflicts:
    	.gitignore
    	bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch
    	bios_extract.spec
    	sources

 .gitignore                                         |    1 +
 ...tification-of-some-more-Award-BIOS-images.patch |   14 ++++----
 ...e-with-modules-filenames-containing-slash.patch |   36 --------------------
 bios_extract-0003-Allow-CFLAGS-override.patch      |   24 -------------
 bios_extract.spec                                  |   24 ++++++-------
 sources                                            |    2 +-
 6 files changed, 20 insertions(+), 81 deletions(-)
---