[scap-workbench/f16: 6/6] Merge branch 'master' into f16

[Martin Preisler]

commit 610d4a9e01842a66b84abb48bfdf0305a0b28810
Merge: cec8c2b 6d646c0
Author: Martin Preisler <mpreisle at redhat.com>
Date:   Tue Nov 22 20:49:27 2011 +0100

    Merge branch 'master' into f16

 scap-workbench.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---