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

[plautrba]

commit 2c12d426fa984582c58b9ad1294029ca544f1bc2
Merge: 549a416 da0ec65
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Wed Aug 29 16:04:18 2012 +0200

    Merge branch 'master' into f17

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