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

[plautrba]

commit e368e943eedecc396a4513d1d87705b266c6ac99
Merge: 128fcc3 6889799
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Mon Dec 17 14:14:35 2012 +0100

    Merge branch 'f18' into f17

 .gitignore    |    1 +
 openscap.spec |   12 +++++++++---
 sources       |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---