[ksnapshot/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit 0179b272bbc4ed46639b9caca6b8798b88274840
Merge: f58b648 34d9677
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:23:33 2012 -0500

    Merge branch 'f17' into f16

 .gitignore     |    1 +
 ksnapshot.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---