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

[plautrba]

commit 549a4160b3c6230c41d324c3313ee18b581e7431
Merge: 1711a40 bafc197
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Tue Aug 7 14:28:03 2012 +0200

    Merge branch 'master' into f17

 .gitignore                   |    1 +
 openscap-0.8.3-resolve.patch |   16 ----------------
 openscap.spec                |   10 +++++-----
 sources                      |    2 +-
 4 files changed, 7 insertions(+), 22 deletions(-)
---