[scap-workbench/f14: 9/9] Merged f15 branch into f14

[Martin Preisler]

commit 988b490b56d88d74220b4c4787cd1f52d35abaec
Merge: 06a0339 77f7641
Author: Martin Preisler <mpreisle at redhat.com>
Date:   Tue Nov 22 21:19:55 2011 +0100

    Merged f15 branch into f14

 .gitignore          |    1 +
 scap-workbench.spec |    5 ++++-
 sources             |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc sources
index e00d87d,e829de7..1f432ed
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
 +c57bd0cddda5a702056f513b8f216af8  scap-workbench-0.5.1.tar.bz2
+ f69f1685285b83cdabd85cddb84882ad  scap-workbench-0.5.2.tar.bz2