[openscap/f17: 2/2] Merge branch 'f18' into f17

[plautrba]

commit fa44079c7831a5b12766a620091c8c9b378bbaa3
Merge: f23745b 3f88c5e
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Mon Oct 22 14:57:38 2012 +0200

    Merge branch 'f18' into f17

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