[openscap/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17

[Peter Vrabec]

commit f23745b923c01bd0c60036d19a766eeb772e4e2e
Merge: 2c12d42 4344c90
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Wed Sep 26 10:16:33 2012 +0200

    Merge remote-tracking branch 'origin/master' into f17

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