[rpmlint/f14/master: 3/3] Merge branch 'master' into f14

[Ville Skyttä]

commit e52034367b369bb6bda63c973224548baadbe7ec
Merge: 3d6c6d2 db3d04e
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Aug 19 19:07:13 2010 +0300

    Merge branch 'master' into f14
    
    Conflicts:
    	rpmlint.spec

 .gitignore     |    2 +-
 rpmlint.config |    3 ++-
 rpmlint.spec   |    8 ++++++--
 sources        |    2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)
---