[scap-workbench/f16: 4/6] Merged master branch into f16

[Martin Preisler]

commit cec8c2bab83b1970b136a34cb9e690147a7d1539
Merge: da4278b 4b8abf1
Author: Martin Preisler <mpreisle at redhat.com>
Date:   Tue Nov 22 20:46:40 2011 +0100

    Merged master branch into f16

 .gitignore          |    1 +
 scap-workbench.spec |    8 +++++++-
 sources             |    1 +
 3 files changed, 9 insertions(+), 1 deletions(-)
---
diff --cc sources
index e00d87d,2b74c3f..e1de4a3
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
 +c57bd0cddda5a702056f513b8f216af8  scap-workbench-0.5.1.tar.bz2
+ 02018ce89b9d9a1e6c68dd84d395c3e9  scap-workbench-0.6.0.tar.bz2