[system-config-audit: 3/3] Merge branch 'f14'

[Miloslav Trmac]

commit dc6ab6088c748d4a457aa05f4f68caee7fb47aa4
Merge: 0ea3ef9 befeda8
Author: Miloslav Trmač <mitr at redhat.com>
Date:   Thu Aug 26 23:15:17 2010 +0200

    Merge branch 'f14'
    
    Conflicts:
    	system-config-audit.spec

 .gitignore               |    1 +
 sources                  |    2 +-
 system-config-audit.spec |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---