[openscap/f14: 22/22] Merge remote-tracking branch 'origin/master' into f14

[Peter Vrabec]

commit bf33f340e39da0be61cb56688550bb076964e2c3
Merge: b76e851 78059aa
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Mon Oct 24 23:38:57 2011 +0200

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

 .gitignore                   |    5 ++-
 openscap-0.8.0-example.patch |   70 ++++++++++++++++++++++++++++++++++++++++++
 openscap.spec                |   41 ++++++++++++++++++++++--
 sources                      |    2 +-
 4 files changed, 113 insertions(+), 5 deletions(-)
---