[openscap/f17: 6/6] Merge remote-tracking branch 'origin/f18' into f17

[plautrba]

commit b0336c768c89b363e029185b6e3775563e5c4348
Merge: 7cd8295 829b851
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Mon Apr 29 15:25:46 2013 +0200

    Merge remote-tracking branch 'origin/f18' into f17
    
    Conflicts:
    	.gitignore
    	openscap.spec
    	sources

 .gitignore    |    2 ++
 openscap.spec |    8 +++++++-
 sources       |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---